From 7f48b797581e3559f97814433cf65338e4ea0f28 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 14 Jun 2011 16:38:02 -0700 Subject: protocol-native: Use original requested latency on stream moves We were calculating new latency based on the latency set on the old sink/source, rather than the actual latency requested by the client. Over a series of moves, this will lead the latency being ~halved each time, resulting in an eventual rewind flood from a latency that cannot be handled. --- src/pulsecore/protocol-native.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index e0a195ee..d8df8604 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -87,6 +87,9 @@ typedef struct record_stream { pa_bool_t adjust_latency:1; pa_bool_t early_requests:1; + /* Requested buffer attributes */ + pa_buffer_attr buffer_attr_req; + /* Fixed-up and adjusted buffer attributes */ pa_buffer_attr buffer_attr; pa_atomic_t on_the_fly; @@ -132,6 +135,9 @@ typedef struct playback_stream { pa_atomic_t missing; pa_usec_t configured_sink_latency; + /* Requested buffer attributes */ + pa_buffer_attr buffer_attr_req; + /* Fixed-up and adjusted buffer attributes */ pa_buffer_attr buffer_attr; /* Only updated after SINK_INPUT_MESSAGE_UPDATE_LATENCY */ @@ -526,6 +532,7 @@ static void fix_record_buffer_attr_pre(record_stream *s) { * ->thread_info data! */ frame_size = pa_frame_size(&s->source_output->sample_spec); + s->buffer_attr = s->buffer_attr_req; if (s->buffer_attr.maxlength == (uint32_t) -1 || s->buffer_attr.maxlength > MAX_MEMBLOCKQ_LENGTH) s->buffer_attr.maxlength = MAX_MEMBLOCKQ_LENGTH; @@ -666,7 +673,7 @@ static record_stream* record_stream_new( s->parent.process_msg = record_stream_process_msg; s->connection = c; s->source_output = source_output; - s->buffer_attr = *attr; + s->buffer_attr_req = *attr; s->adjust_latency = adjust_latency; s->early_requests = early_requests; pa_atomic_store(&s->on_the_fly, 0); @@ -881,6 +888,7 @@ static void fix_playback_buffer_attr(playback_stream *s) { * ->thread_info data, such as the memblockq! */ frame_size = pa_frame_size(&s->sink_input->sample_spec); + s->buffer_attr = s->buffer_attr_req; if (s->buffer_attr.maxlength == (uint32_t) -1 || s->buffer_attr.maxlength > MAX_MEMBLOCKQ_LENGTH) s->buffer_attr.maxlength = MAX_MEMBLOCKQ_LENGTH; @@ -1105,7 +1113,7 @@ static playback_stream* playback_stream_new( s->is_underrun = TRUE; s->drain_request = FALSE; pa_atomic_store(&s->missing, 0); - s->buffer_attr = *a; + s->buffer_attr_req = *a; s->adjust_latency = adjust_latency; s->early_requests = early_requests; pa_atomic_store(&s->seek_or_post_in_queue, 0); @@ -3790,7 +3798,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u s->adjust_latency = adjust_latency; s->early_requests = early_requests; - s->buffer_attr = a; + s->buffer_attr_req = a; fix_playback_buffer_attr(s); pa_assert_se(pa_asyncmsgq_send(s->sink_input->sink->asyncmsgq, PA_MSGOBJECT(s->sink_input), SINK_INPUT_MESSAGE_UPDATE_BUFFER_ATTR, NULL, 0, NULL) == 0); @@ -3826,7 +3834,7 @@ static void command_set_stream_buffer_attr(pa_pdispatch *pd, uint32_t command, u s->adjust_latency = adjust_latency; s->early_requests = early_requests; - s->buffer_attr = a; + s->buffer_attr_req = a; fix_record_buffer_attr_pre(s); pa_memblockq_set_maxlength(s->memblockq, s->buffer_attr.maxlength); -- cgit