mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
[ALSA] PCM core - remove SNDRV_PCM_TSTAMP_MMAP condition in snd_pcm_status()
The condition caused that the returned ring buffer position does not match with timestamp when SNDRV_PCM_TSTAMP_MMAP mode was enabled. Removing condition makes unified behaviour and interrupt based timestamp can be accessed via PCM_IOCTL_SYNC_PTR or mmaped status area. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
parent
0678accd2d
commit
a713b58347
1 changed files with 2 additions and 7 deletions
|
@ -593,14 +593,9 @@ int snd_pcm_status(struct snd_pcm_substream *substream,
|
|||
if (status->state == SNDRV_PCM_STATE_OPEN)
|
||||
goto _end;
|
||||
status->trigger_tstamp = runtime->trigger_tstamp;
|
||||
if (snd_pcm_running(substream)) {
|
||||
if (snd_pcm_running(substream))
|
||||
snd_pcm_update_hw_ptr(substream);
|
||||
if (runtime->tstamp_mode == SNDRV_PCM_TSTAMP_MMAP)
|
||||
status->tstamp = runtime->status->tstamp;
|
||||
else
|
||||
snd_pcm_gettime(runtime, &status->tstamp);
|
||||
} else
|
||||
snd_pcm_gettime(runtime, &status->tstamp);
|
||||
snd_pcm_gettime(runtime, &status->tstamp);
|
||||
status->appl_ptr = runtime->control->appl_ptr;
|
||||
status->hw_ptr = runtime->status->hw_ptr;
|
||||
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||
|
|
Loading…
Reference in a new issue