RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-26 02:05:31 +00:00
Code Issues Releases Wiki Activity

ao/pulse: properly set device_buffer

Browse Source 
Previously, device_buffer defaulted to 0 on pulse. This meant that
commit baa7b5c would always wait with a timeout of 0, leading to
high CPU usage for PulseAudio users.

By setting device_buffer to the number of samples per channel that
PulseAudio sets as its target, this commit fixes this behaviour.
This commit is contained in:
Nicolas F 2020-06-07 20:14:01 +02:00 committed by Jan Ekström
parent 12415db3a6
commit 0fb02f181f
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/out/ao_pulse.c
View File

@ -465,6 +465,14 @@ static int init(struct ao *ao)
goto unlock_and_fail; goto unlock_and_fail;
} }
const pa_buffer_attr* final_bufattr = pa_stream_get_buffer_attr(priv->stream);
if(!final_bufattr) {
MP_ERR(ao, "PulseAudio didn't tell us what buffer sizes it set. Bailing out.\n");
goto unlock_and_fail;
}
ao->device_buffer = final_bufattr->tlength /
af_fmt_to_bytes(ao->format) / ao->channels.num;
pa_threaded_mainloop_unlock(priv->mainloop); pa_threaded_mainloop_unlock(priv->mainloop);
return 0; return 0;