Commit fb4bd0ad authored by Jaroslav Kysela's avatar Jaroslav Kysela

[ALSA] OSS PCM emulation - The final fix for SNDCTL_DSP_GETOPTR problem

ALSA<-OSS emulation
The problem was negative result (info.bytes) in a specific condition at
playback startup.
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 21cb2a2e
...@@ -1539,10 +1539,13 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str ...@@ -1539,10 +1539,13 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str
} else { } else {
delay = snd_pcm_oss_bytes(substream, delay) + fixup; delay = snd_pcm_oss_bytes(substream, delay) + fixup;
info.blocks = delay / runtime->oss.period_bytes; info.blocks = delay / runtime->oss.period_bytes;
if (stream == SNDRV_PCM_STREAM_PLAYBACK) if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
if (runtime->oss.bytes == 0)
delay = 0;
info.bytes = (runtime->oss.bytes - delay) & INT_MAX; info.bytes = (runtime->oss.bytes - delay) & INT_MAX;
else } else {
info.bytes = (runtime->oss.bytes + delay) & INT_MAX; info.bytes = (runtime->oss.bytes + delay) & INT_MAX;
}
} }
if (copy_to_user(_info, &info, sizeof(info))) if (copy_to_user(_info, &info, sizeof(info)))
return -EFAULT; return -EFAULT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment