mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

memblockq: move minreq handling in to memblockq

Browse source 
Having it handled in the callers proved to be a poor fit as it
became difficult to handle a shrinking minreq sanely. It could end
up in a state where the request was never sent downstream to the
client.
This commit is contained in:
Pierre Ossman 2016-05-19 15:26:08 +02:00 • committed by Arun Raghavan
parent edff1b2204
commit eeec52caa0
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/memblockq.c
View file

@ -840,6 +840,10 @@ size_t pa_memblockq_pop_missing(pa_memblockq *bq) {
if (bq->missing <= 0)
return 0;
if (((size_t) bq->missing < bq->minreq) &&
!pa_memblockq_prebuf_active(bq))
return 0;
l = (size_t) bq->missing;
bq->requested += bq->missing;

9
src/pulsecore/protocol-native.c
View file

@ -1111,8 +1111,7 @@ out:
/* Called from IO context */
static void playback_stream_request_bytes(playback_stream *s) {
size_t m, minreq;
int previous_missing;
size_t m;
playback_stream_assert_ref(s);
@ -1132,11 +1131,7 @@ static void playback_stream_request_bytes(playback_stream *s) {
pa_log("request_bytes(%lu)", (unsigned long) m);
#endif
previous_missing = pa_atomic_add(&s->missing, (int) m);
minreq = pa_memblockq_get_minreq(s->memblockq);
if (pa_memblockq_prebuf_active(s->memblockq) ||
(previous_missing < (int) minreq && previous_missing + (int) m >= (int) minreq))
if (pa_atomic_add(&s->missing, (int) m) <= 0)
pa_asyncmsgq_post(pa_thread_mq_get()->outq, PA_MSGOBJECT(s), PLAYBACK_STREAM_MESSAGE_REQUEST_DATA, NULL, 0, NULL, NULL);
}