mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
[ALSA] OSS PCM emulation - The 2nd final fix for SNDCTL_DSP_GETOPTR problem
ALSA<-OSS emulation The problem was negative/wrong result (info.bytes) in a specific condition at playback startup. Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
parent
98c7f2121d
commit
5ac0fab95c
@ -1537,13 +1537,13 @@ static int snd_pcm_oss_get_ptr(snd_pcm_oss_file_t *pcm_oss_file, int stream, str
|
||||
snd_pcm_oss_simulate_fill(substream, delay);
|
||||
info.bytes = snd_pcm_oss_bytes(substream, runtime->status->hw_ptr) & INT_MAX;
|
||||
} else {
|
||||
delay = snd_pcm_oss_bytes(substream, delay) + fixup;
|
||||
info.blocks = delay / runtime->oss.period_bytes;
|
||||
delay = snd_pcm_oss_bytes(substream, delay);
|
||||
if (stream == SNDRV_PCM_STREAM_PLAYBACK) {
|
||||
if (runtime->oss.bytes == 0)
|
||||
delay = 0;
|
||||
info.blocks = (runtime->oss.buffer_bytes - delay - fixup) / runtime->oss.period_bytes;
|
||||
info.bytes = (runtime->oss.bytes - delay) & INT_MAX;
|
||||
} else {
|
||||
delay += fixup;
|
||||
info.blocks = delay / runtime->oss.period_bytes;
|
||||
info.bytes = (runtime->oss.bytes + delay) & INT_MAX;
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user