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

* enable write_index correction and timing interpolation only for playback (and record) streams

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@656 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-07 21:55:55 +00:00
parent 22558b5e0e
commit fdb48b4340
1 changed files with 46 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

85
src/polyp/stream.c
View file

@ -371,7 +371,8 @@ void pa_create_stream_callback(pa_pdispatch *pd, uint32_t command, PA_GCC_UNUSED
/* We add an extra ref as long as we're connected (i.e. in the dynarray) */ /* We add an extra ref as long as we're connected (i.e. in the dynarray) */
pa_stream_ref(s); pa_stream_ref(s);
if (s->flags & PA_STREAM_INTERPOLATE_TIMING) { if (s->direction != PA_STREAM_UPLOAD &&
s->flags & PA_STREAM_INTERPOLATE_TIMING) {
struct timeval tv; struct timeval tv;
pa_gettimeofday(&tv); pa_gettimeofday(&tv);
@ -542,31 +543,33 @@ int pa_stream_write(
else else
s->requested_bytes = 0; s->requested_bytes = 0;
/* Update latency request correction */ if (s->direction == PA_STREAM_PLAYBACK) {
if (s->latency_corrections[s->idx_latency_correction].valid) { /* Update latency request correction */
if (s->latency_corrections[s->idx_latency_correction].valid) {
if (seek == PA_SEEK_ABSOLUTE) {
s->latency_corrections[s->idx_latency_correction].corrupt = 0; if (seek == PA_SEEK_ABSOLUTE) {
s->latency_corrections[s->idx_latency_correction].absolute = 1; s->latency_corrections[s->idx_latency_correction].corrupt = 0;
s->latency_corrections[s->idx_latency_correction].value = offset + length; s->latency_corrections[s->idx_latency_correction].absolute = 1;
} else if (seek == PA_SEEK_RELATIVE) { s->latency_corrections[s->idx_latency_correction].value = offset + length;
if (!s->latency_corrections[s->idx_latency_correction].corrupt) } else if (seek == PA_SEEK_RELATIVE) {
s->latency_corrections[s->idx_latency_correction].value += offset + length; if (!s->latency_corrections[s->idx_latency_correction].corrupt)
} else s->latency_corrections[s->idx_latency_correction].value += offset + length;
s->latency_corrections[s->idx_latency_correction].corrupt = 1; } else
} s->latency_corrections[s->idx_latency_correction].corrupt = 1;
}
/* Update the write index in the already available latency data */
if (s->timing_info_valid) { /* Update the write index in the already available latency data */
if (s->timing_info_valid) {
if (seek == PA_SEEK_ABSOLUTE) {
s->timing_info.write_index_corrupt = 0; if (seek == PA_SEEK_ABSOLUTE) {
s->timing_info.write_index = offset + length; s->timing_info.write_index_corrupt = 0;
} else if (seek == PA_SEEK_RELATIVE) { s->timing_info.write_index = offset + length;
if (!s->timing_info.write_index_corrupt) } else if (seek == PA_SEEK_RELATIVE) {
s->timing_info.write_index += offset + length; if (!s->timing_info.write_index_corrupt)
} else s->timing_info.write_index += offset + length;
s->timing_info.write_index_corrupt = 1; } else
s->timing_info.write_index_corrupt = 1;
}
} }
return 0; return 0;
@ -759,7 +762,7 @@ static void stream_get_timing_info_callback(pa_pdispatch *pd, uint32_t command,
o->stream->latency_corrections[n].valid = 0; o->stream->latency_corrections[n].valid = 0;
} }
} }
if (o->callback) { if (o->callback) {
pa_stream_success_cb_t cb = (pa_stream_success_cb_t) o->callback; pa_stream_success_cb_t cb = (pa_stream_success_cb_t) o->callback;
cb(o->stream, o->stream->timing_info_valid, o->userdata); cb(o->stream, o->stream->timing_info_valid, o->userdata);
@ -784,11 +787,13 @@ pa_operation* pa_stream_update_timing_info(pa_stream *s, pa_stream_success_cb_t
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state == PA_STREAM_READY, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->state == PA_STREAM_READY, PA_ERR_BADSTATE);
PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction != PA_STREAM_UPLOAD, PA_ERR_BADSTATE); PA_CHECK_VALIDITY_RETURN_NULL(s->context, s->direction != PA_STREAM_UPLOAD, PA_ERR_BADSTATE);
/* Find a place to store the write_index correction data for this entry */ if (s->direction == PA_STREAM_PLAYBACK) {
cidx = (s->idx_latency_correction + 1) % PA_MAX_LATENCY_CORRECTIONS; /* Find a place to store the write_index correction data for this entry */
cidx = (s->idx_latency_correction + 1) % PA_MAX_LATENCY_CORRECTIONS;
/* Check if we could allocate a correction slot. If not, there are too many outstanding queries */
PA_CHECK_VALIDITY_RETURN_NULL(s->context, !s->latency_corrections[cidx].valid, PA_ERR_INTERNAL); /* Check if we could allocate a correction slot. If not, there are too many outstanding queries */
PA_CHECK_VALIDITY_RETURN_NULL(s->context, !s->latency_corrections[cidx].valid, PA_ERR_INTERNAL);
}
o = pa_operation_new(s->context, s, (pa_operation_cb_t) cb, userdata); o = pa_operation_new(s->context, s, (pa_operation_cb_t) cb, userdata);
@ -802,13 +807,15 @@ pa_operation* pa_stream_update_timing_info(pa_stream *s, pa_stream_success_cb_t
pa_pstream_send_tagstruct(s->context->pstream, t); pa_pstream_send_tagstruct(s->context->pstream, t);
pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_get_timing_info_callback, o); pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_get_timing_info_callback, o);
/* Fill in initial correction data */ if (s->direction == PA_STREAM_PLAYBACK) {
o->stream->idx_latency_correction = cidx; /* Fill in initial correction data */
o->stream->latency_corrections[cidx].valid = 1; o->stream->idx_latency_correction = cidx;
o->stream->latency_corrections[cidx].tag = tag; o->stream->latency_corrections[cidx].valid = 1;
o->stream->latency_corrections[cidx].absolute = 0; o->stream->latency_corrections[cidx].tag = tag;
o->stream->latency_corrections[cidx].value = 0; o->stream->latency_corrections[cidx].absolute = 0;
o->stream->latency_corrections[cidx].corrupt = 0; o->stream->latency_corrections[cidx].value = 0;
o->stream->latency_corrections[cidx].corrupt = 0;
}
return pa_operation_ref(o); return pa_operation_ref(o);
} }