mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-10 13:29:58 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "memblockq: remove internal "missing" state variable"

Browse source 
This reverts commit 74251f0786.

The reverted commit was not intended to make any behavioral changes, but
it broke at least the case where a client writes more data than the
server has requested.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=99211
This commit is contained in:
Tanu Kaskinen 2016-12-28 16:09:54 +02:00
parent f7b8df50c7
commit 5d3d4f5970
1 changed files with 24 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

51
src/pulsecore/memblockq.c
View file

@ -53,7 +53,7 @@ struct pa_memblockq {
bool in_prebuf; bool in_prebuf;
pa_memchunk silence; pa_memchunk silence;
pa_mcalign *mcalign; pa_mcalign *mcalign;
size_t requested; int64_t missing, requested;
char *name; char *name;
pa_sample_spec sample_spec; pa_sample_spec sample_spec;
}; };
@ -251,12 +251,10 @@ static void write_index_changed(pa_memblockq *bq, int64_t old_write_index, bool
delta = bq->write_index - old_write_index; delta = bq->write_index - old_write_index;
if (account) { if (account)
if (delta > (int64_t)bq->requested) bq->requested -= delta;
bq->requested = 0; else
else if (delta > 0) bq->missing -= delta;
bq->requested -= delta;
}
#ifdef MEMBLOCKQ_DEBUG #ifdef MEMBLOCKQ_DEBUG
pa_log_debug("[%s] pushed/seeked %lli: requested counter at %lli, account=%i", bq->name, (long long) delta, (long long) bq->requested, account); pa_log_debug("[%s] pushed/seeked %lli: requested counter at %lli, account=%i", bq->name, (long long) delta, (long long) bq->requested, account);
@ -264,14 +262,15 @@ static void write_index_changed(pa_memblockq *bq, int64_t old_write_index, bool
} }
static void read_index_changed(pa_memblockq *bq, int64_t old_read_index) { static void read_index_changed(pa_memblockq *bq, int64_t old_read_index) {
#ifdef MEMBLOCKQ_DEBUG
int64_t delta; int64_t delta;
pa_assert(bq); pa_assert(bq);
delta = bq->read_index - old_read_index; delta = bq->read_index - old_read_index;
bq->missing += delta;
pa_log_debug("[%s] popped %lli", bq->name, (long long) delta); #ifdef MEMBLOCKQ_DEBUG
pa_log_debug("[%s] popped %lli: missing counter at %lli", bq->name, (long long) delta, (long long) bq->missing);
#endif #endif
} }
@ -830,37 +829,31 @@ size_t pa_memblockq_get_prebuf(pa_memblockq *bq) {
} }
size_t pa_memblockq_pop_missing(pa_memblockq *bq) { size_t pa_memblockq_pop_missing(pa_memblockq *bq) {
int64_t length; size_t l;
size_t missing;
pa_assert(bq); pa_assert(bq);
/* Note that write_index might be before read_index, which means #ifdef MEMBLOCKQ_DEBUG
* that we should ask for extra data to catch up. This also means pa_log_debug("[%s] pop: %lli", bq->name, (long long) bq->missing);
* that we cannot call pa_memblockq_length() as it doesn't return #endif
* negative values. */
length = (bq->write_index - bq->read_index) + bq->requested; if (bq->missing <= 0)
if (length > (int64_t)bq->tlength)
return 0; return 0;
missing = (int64_t)bq->tlength - length; if (((size_t) bq->missing < bq->minreq) &&
if (missing == 0)
return 0;
if ((missing < bq->minreq) &&
!pa_memblockq_prebuf_active(bq)) !pa_memblockq_prebuf_active(bq))
return 0; return 0;
bq->requested += missing; l = (size_t) bq->missing;
bq->requested += bq->missing;
bq->missing = 0;
#ifdef MEMBLOCKQ_DEBUG #ifdef MEMBLOCKQ_DEBUG
pa_log_debug("[%s] sent %lli: request counter is at %lli", bq->name, (long long) missing, (long long) bq->requested); pa_log_debug("[%s] sent %lli: request counter is at %lli", bq->name, (long long) l, (long long) bq->requested);
#endif #endif
return missing; return l;
} }
void pa_memblockq_set_maxlength(pa_memblockq *bq, size_t maxlength) { void pa_memblockq_set_maxlength(pa_memblockq *bq, size_t maxlength) {
@ -876,11 +869,13 @@ void pa_memblockq_set_maxlength(pa_memblockq *bq, size_t maxlength) {
} }
void pa_memblockq_set_tlength(pa_memblockq *bq, size_t tlength) { void pa_memblockq_set_tlength(pa_memblockq *bq, size_t tlength) {
size_t old_tlength;
pa_assert(bq); pa_assert(bq);
if (tlength <= 0 || tlength == (size_t) -1) if (tlength <= 0 || tlength == (size_t) -1)
tlength = bq->maxlength; tlength = bq->maxlength;
old_tlength = bq->tlength;
bq->tlength = ((tlength+bq->base-1)/bq->base)*bq->base; bq->tlength = ((tlength+bq->base-1)/bq->base)*bq->base;
if (bq->tlength > bq->maxlength) if (bq->tlength > bq->maxlength)
@ -891,6 +886,8 @@ void pa_memblockq_set_tlength(pa_memblockq *bq, size_t tlength) {
if (bq->prebuf > bq->tlength+bq->base-bq->minreq) if (bq->prebuf > bq->tlength+bq->base-bq->minreq)
pa_memblockq_set_prebuf(bq, bq->tlength+bq->base-bq->minreq); pa_memblockq_set_prebuf(bq, bq->tlength+bq->base-bq->minreq);
bq->missing += (int64_t) bq->tlength - (int64_t) old_tlength;
} }
void pa_memblockq_set_minreq(pa_memblockq *bq, size_t minreq) { void pa_memblockq_set_minreq(pa_memblockq *bq, size_t minreq) {