From 53e18c2ad759ac42487053e7531a67a3a4678531 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 18 Jan 2010 01:33:04 +0100 Subject: native: rework handling of seeks that depend on variables the client does not know anything about All seeks/flushes that depend on the playback buffer read pointer cannot be accounted for properly in the client since it does not know the actual read pointer. Due to that the clients do not account for it at all. We need do the same on the server side. And we did, but a little bit too extreme. While we properly have not applied the changes to the "request" counter we still do have to apply it to the "missing" counter. This patch fixes that. --- src/modules/module-combine.c | 4 ++-- src/modules/module-loopback.c | 4 ++-- src/pulse/stream.c | 5 +++++ src/pulsecore/memblockq.c | 6 ++++-- src/pulsecore/memblockq.h | 2 +- src/pulsecore/protocol-native.c | 6 +++++- src/pulsecore/sink-input.c | 2 +- 7 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/modules/module-combine.c b/src/modules/module-combine.c index 62e626791..cffb901b6 100644 --- a/src/modules/module-combine.c +++ b/src/modules/module-combine.c @@ -562,7 +562,7 @@ static int sink_input_process_msg(pa_msgobject *obj, int code, void *data, int64 if (PA_SINK_IS_OPENED(o->sink_input->sink->thread_info.state)) pa_memblockq_push_align(o->memblockq, chunk); else - pa_memblockq_flush_write(o->memblockq); + pa_memblockq_flush_write(o->memblockq, TRUE); return 0; } @@ -982,7 +982,7 @@ static void output_disable(struct output *o) { o->sink_input = NULL; /* Finally, drop all queued data */ - pa_memblockq_flush_write(o->memblockq); + pa_memblockq_flush_write(o->memblockq, TRUE); pa_asyncmsgq_flush(o->inq, FALSE); pa_asyncmsgq_flush(o->outq, FALSE); } diff --git a/src/modules/module-loopback.c b/src/modules/module-loopback.c index bb0182b00..15ef96efe 100644 --- a/src/modules/module-loopback.c +++ b/src/modules/module-loopback.c @@ -430,7 +430,7 @@ static int sink_input_process_msg_cb(pa_msgobject *obj, int code, void *data, in if (PA_SINK_IS_OPENED(u->sink_input->sink->thread_info.state)) pa_memblockq_push_align(u->memblockq, chunk); else - pa_memblockq_flush_write(u->memblockq); + pa_memblockq_flush_write(u->memblockq, TRUE); update_min_memblockq_length(u); @@ -457,7 +457,7 @@ static int sink_input_process_msg_cb(pa_msgobject *obj, int code, void *data, in if (PA_SINK_IS_OPENED(u->sink_input->sink->thread_info.state)) pa_memblockq_seek(u->memblockq, -offset, PA_SEEK_RELATIVE, TRUE); else - pa_memblockq_flush_write(u->memblockq); + pa_memblockq_flush_write(u->memblockq, TRUE); u->recv_counter -= offset; diff --git a/src/pulse/stream.c b/src/pulse/stream.c index ab8f8f436..8da40eca0 100644 --- a/src/pulse/stream.c +++ b/src/pulse/stream.c @@ -2146,6 +2146,11 @@ pa_operation* pa_stream_flush(pa_stream *s, pa_stream_success_cb_t cb, void *use * index, but the read index might jump. */ invalidate_indexes(s, TRUE, FALSE); + /* Note that we do not update requested_bytes here. This is + * because we cannot really know how data actually was dropped + * from the write index due to this. This 'error' will be applied + * by both client and server and hence we should be fine. */ + return o; } diff --git a/src/pulsecore/memblockq.c b/src/pulsecore/memblockq.c index 4641801d4..2b063fac5 100644 --- a/src/pulsecore/memblockq.c +++ b/src/pulsecore/memblockq.c @@ -254,6 +254,8 @@ static void write_index_changed(pa_memblockq *bq, int64_t old_write_index, pa_bo if (account) bq->requested -= delta; + else + bq->missing -= delta; /* pa_log("pushed/seeked %lli: requested counter at %lli, account=%i", (long long) delta, (long long) bq->requested, account); */ } @@ -642,7 +644,7 @@ void pa_memblockq_seek(pa_memblockq *bq, int64_t offset, pa_seek_mode_t seek, pa write_index_changed(bq, old, account); } -void pa_memblockq_flush_write(pa_memblockq *bq) { +void pa_memblockq_flush_write(pa_memblockq *bq, pa_bool_t account) { int64_t old; pa_assert(bq); @@ -652,7 +654,7 @@ void pa_memblockq_flush_write(pa_memblockq *bq) { bq->write_index = bq->read_index; pa_memblockq_prebuf_force(bq); - write_index_changed(bq, old, TRUE); + write_index_changed(bq, old, account); } void pa_memblockq_flush_read(pa_memblockq *bq) { diff --git a/src/pulsecore/memblockq.h b/src/pulsecore/memblockq.h index 587c364b1..6132f31b2 100644 --- a/src/pulsecore/memblockq.h +++ b/src/pulsecore/memblockq.h @@ -118,7 +118,7 @@ size_t pa_memblockq_pop_missing(pa_memblockq *bq); int pa_memblockq_splice(pa_memblockq *bq, pa_memblockq *source); /* Set the queue to silence, set write index to read index */ -void pa_memblockq_flush_write(pa_memblockq *bq); +void pa_memblockq_flush_write(pa_memblockq *bq, pa_bool_t account); /* Set the queue to silence, set write read index to write index*/ void pa_memblockq_flush_read(pa_memblockq *bq); diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index b7b3f59dc..f80b0c250 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -1325,6 +1325,10 @@ static void handle_seek(playback_stream *s, int64_t indexw) { playback_stream_request_bytes(s); } +static void flush_write_no_account(pa_memblockq *q) { + pa_memblockq_flush_write(q, FALSE); +} + /* Called from thread context */ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int64_t offset, pa_memchunk *chunk) { pa_sink_input *i = PA_SINK_INPUT(o); @@ -1386,7 +1390,7 @@ static int sink_input_process_msg(pa_msgobject *o, int code, void *userdata, int switch (code) { case SINK_INPUT_MESSAGE_FLUSH: - func = pa_memblockq_flush_write; + func = flush_write_no_account; break; case SINK_INPUT_MESSAGE_PREBUF_FORCE: diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c index aa84ccb1e..7acb25ff8 100644 --- a/src/pulsecore/sink-input.c +++ b/src/pulsecore/sink-input.c @@ -801,7 +801,7 @@ void pa_sink_input_process_rewind(pa_sink_input *i, size_t nbytes /* in sink sam /* We were asked to drop all buffered data, and rerequest new * data from implementor the next time push() is called */ - pa_memblockq_flush_write(i->thread_info.render_memblockq); + pa_memblockq_flush_write(i->thread_info.render_memblockq, TRUE); } else if (i->thread_info.rewrite_nbytes > 0) { size_t max_rewrite, amount; -- cgit v1.2.3