github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-14 22:48:35 +01:00
Code Releases Activity

audio: don't block on lock in ao_read_data

Browse Source 
ao_read_data() is used by pull AOs potentially from threads managed by
external libraries.  These threads can be sensitive to blocking.
For example the pipewire ao is using a realtime thread for the
callbacks.
This commit is contained in:
Thomas Weißschuh 2023-10-15 19:09:34 +02:00 committed by sfan5
parent dd13412986
commit ae908a70ce
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
audio/out/buffer.c
View File

@ -184,7 +184,8 @@ int ao_read_data(struct ao *ao, void **data, int samples, int64_t out_time_ns)
struct buffer_state *p = ao->buffer_state;
assert(!ao->driver->write);
pthread_mutex_lock(&p->lock);
if (pthread_mutex_trylock(&p->lock))
return 0;
int pos = read_buffer(ao, data, samples, &(bool){0});