X-Git-Url: https://code.delx.au/pulseaudio/blobdiff_plain/f05a4ac806d8d44ab1377ea2069abb1da7ab9d16..fa499dad06ba6558111cdef64c18f2401e803cff:/polyp/polyplib-stream.c diff --git a/polyp/polyplib-stream.c b/polyp/polyplib-stream.c index 98610d61..a97096b4 100644 --- a/polyp/polyplib-stream.c +++ b/polyp/polyplib-stream.c @@ -4,7 +4,7 @@ This file is part of polypaudio. polypaudio is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published + it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Lesser General Public License along with polypaudio; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. @@ -26,12 +26,15 @@ #include #include #include +#include #include "polyplib-internal.h" #include "xmalloc.h" #include "pstream-util.h" #include "util.h" +#define LATENCY_IPOL_INTERVAL_USEC (100000L) + struct pa_stream *pa_stream_new(struct pa_context *c, const char *name, const struct pa_sample_spec *ss) { struct pa_stream *s; assert(c && ss); @@ -39,6 +42,7 @@ struct pa_stream *pa_stream_new(struct pa_context *c, const char *name, const st s = pa_xmalloc(sizeof(struct pa_stream)); s->ref = 1; s->context = c; + s->mainloop = c->mainloop; s->read_callback = NULL; s->read_userdata = NULL; @@ -47,7 +51,7 @@ struct pa_stream *pa_stream_new(struct pa_context *c, const char *name, const st s->state_callback = NULL; s->state_userdata = NULL; - s->state = PA_STREAM_NODIRECTION; + s->direction = PA_STREAM_NODIRECTION; s->name = pa_xstrdup(name); s->sample_spec = *ss; s->channel = 0; @@ -57,6 +61,16 @@ struct pa_stream *pa_stream_new(struct pa_context *c, const char *name, const st s->state = PA_STREAM_DISCONNECTED; memset(&s->buffer_attr, 0, sizeof(s->buffer_attr)); + s->counter = 0; + s->previous_time = 0; + + s->corked = 0; + s->interpolate = 0; + + s->ipol_usec = 0; + memset(&s->ipol_timestamp, 0, sizeof(s->ipol_timestamp)); + s->ipol_event = NULL; + PA_LLIST_PREPEND(struct pa_stream, c->streams, s); return pa_stream_ref(s); @@ -64,6 +78,12 @@ struct pa_stream *pa_stream_new(struct pa_context *c, const char *name, const st static void stream_free(struct pa_stream *s) { assert(s); + + if (s->ipol_event) { + assert(s->mainloop); + s->mainloop->time_free(s->ipol_event); + } + pa_xfree(s->name); pa_xfree(s); } @@ -178,6 +198,22 @@ finish: pa_context_unref(c); } +static void ipol_callback(struct pa_mainloop_api *m, struct pa_time_event *e, const struct timeval *tv, void *userdata) { + struct timeval tv2; + struct pa_stream *s = userdata; + + pa_stream_ref(s); + pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); + + gettimeofday(&tv2, NULL); + tv2.tv_usec += LATENCY_IPOL_INTERVAL_USEC; + + m->time_restart(e, &tv2); + + pa_stream_unref(s); +} + + void pa_create_stream_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) { struct pa_stream *s = userdata; assert(pd && s && s->state == PA_STREAM_CREATING); @@ -194,7 +230,7 @@ void pa_create_stream_callback(struct pa_pdispatch *pd, uint32_t command, uint32 if (pa_tagstruct_getu32(t, &s->channel) < 0 || ((s->direction != PA_STREAM_UPLOAD) && pa_tagstruct_getu32(t, &s->device_index) < 0) || - ((s->direction == PA_STREAM_PLAYBACK) && pa_tagstruct_getu32(t, &s->requested_bytes) < 0) || + ((s->direction != PA_STREAM_RECORD) && pa_tagstruct_getu32(t, &s->requested_bytes) < 0) || !pa_tagstruct_eof(t)) { pa_context_fail(s->context, PA_ERROR_PROTOCOL); goto finish; @@ -204,6 +240,17 @@ void pa_create_stream_callback(struct pa_pdispatch *pd, uint32_t command, uint32 pa_dynarray_put((s->direction == PA_STREAM_RECORD) ? s->context->record_streams : s->context->playback_streams, s->channel, s); pa_stream_set_state(s, PA_STREAM_READY); + if (s->interpolate) { + struct timeval tv; + pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); + + gettimeofday(&tv, NULL); + tv.tv_usec += LATENCY_IPOL_INTERVAL_USEC; /* every 100 ms */ + + assert(!s->ipol_event); + s->ipol_event = s->mainloop->time_new(s->mainloop, &tv, &ipol_callback, s); + } + if (s->requested_bytes && s->ref > 1 && s->write_callback) s->write_callback(s, s->requested_bytes, s->write_userdata); @@ -211,12 +258,15 @@ finish: pa_stream_unref(s); } -static void create_stream(struct pa_stream *s, const char *dev, const struct pa_buffer_attr *attr) { +static void create_stream(struct pa_stream *s, const char *dev, const struct pa_buffer_attr *attr, enum pa_stream_flags flags, pa_volume_t volume) { struct pa_tagstruct *t; uint32_t tag; assert(s && s->ref >= 1 && s->state == PA_STREAM_DISCONNECTED); pa_stream_ref(s); + + s->interpolate = !!(flags & PA_STREAM_INTERPOLATE_LATENCY); + pa_stream_trash_ipol(s); if (attr) s->buffer_attr = *attr; @@ -235,9 +285,9 @@ static void create_stream(struct pa_stream *s, const char *dev, const struct pa_ if (!dev) { if (s->direction == PA_STREAM_PLAYBACK) - dev = getenv(ENV_DEFAULT_SINK); + dev = s->context->conf->default_sink; else - dev = getenv(ENV_DEFAULT_SOURCE); + dev = s->context->conf->default_source; } pa_tagstruct_putu32(t, s->direction == PA_STREAM_PLAYBACK ? PA_COMMAND_CREATE_PLAYBACK_STREAM : PA_COMMAND_CREATE_RECORD_STREAM); @@ -245,12 +295,14 @@ static void create_stream(struct pa_stream *s, const char *dev, const struct pa_ pa_tagstruct_puts(t, s->name); pa_tagstruct_put_sample_spec(t, &s->sample_spec); pa_tagstruct_putu32(t, PA_INVALID_INDEX); - pa_tagstruct_puts(t, dev ? dev : ""); + pa_tagstruct_puts(t, dev); pa_tagstruct_putu32(t, s->buffer_attr.maxlength); + pa_tagstruct_put_boolean(t, !!(flags & PA_STREAM_START_CORKED)); if (s->direction == PA_STREAM_PLAYBACK) { pa_tagstruct_putu32(t, s->buffer_attr.tlength); pa_tagstruct_putu32(t, s->buffer_attr.prebuf); pa_tagstruct_putu32(t, s->buffer_attr.minreq); + pa_tagstruct_putu32(t, volume); } else pa_tagstruct_putu32(t, s->buffer_attr.fragsize); @@ -260,16 +312,16 @@ static void create_stream(struct pa_stream *s, const char *dev, const struct pa_ pa_stream_unref(s); } -void pa_stream_connect_playback(struct pa_stream *s, const char *dev, const struct pa_buffer_attr *attr) { +void pa_stream_connect_playback(struct pa_stream *s, const char *dev, const struct pa_buffer_attr *attr, enum pa_stream_flags flags, pa_volume_t volume) { assert(s && s->context->state == PA_CONTEXT_READY && s->ref >= 1); s->direction = PA_STREAM_PLAYBACK; - create_stream(s, dev, attr); + create_stream(s, dev, attr, flags, volume); } -void pa_stream_connect_record(struct pa_stream *s, const char *dev, const struct pa_buffer_attr *attr) { +void pa_stream_connect_record(struct pa_stream *s, const char *dev, const struct pa_buffer_attr *attr, enum pa_stream_flags flags) { assert(s && s->context->state == PA_CONTEXT_READY && s->ref >= 1); s->direction = PA_STREAM_RECORD; - create_stream(s, dev, attr); + create_stream(s, dev, attr, flags, 0); } void pa_stream_write(struct pa_stream *s, const void *data, size_t length, void (*free_cb)(void *p), size_t delta) { @@ -294,11 +346,13 @@ void pa_stream_write(struct pa_stream *s, const void *data, size_t length, void s->requested_bytes -= length; else s->requested_bytes = 0; + + s->counter += length; } size_t pa_stream_writable_size(struct pa_stream *s) { - assert(s && s->state == PA_STREAM_READY && s->ref >= 1); - return s->requested_bytes; + assert(s && s->ref >= 1); + return s->state == PA_STREAM_READY ? s->requested_bytes : 0; } struct pa_operation * pa_stream_drain(struct pa_stream *s, void (*cb) (struct pa_stream*s, int success, void *userdata), void *userdata) { @@ -323,7 +377,7 @@ struct pa_operation * pa_stream_drain(struct pa_stream *s, void (*cb) (struct pa return pa_operation_ref(o); } -static void stream_get_latency_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) { +static void stream_get_latency_info_callback(struct pa_pdispatch *pd, uint32_t command, uint32_t tag, struct pa_tagstruct *t, void *userdata) { struct pa_operation *o = userdata; struct pa_latency_info i, *p = NULL; struct timeval local, remote, now; @@ -335,25 +389,44 @@ static void stream_get_latency_callback(struct pa_pdispatch *pd, uint32_t comman } else if (pa_tagstruct_get_usec(t, &i.buffer_usec) < 0 || pa_tagstruct_get_usec(t, &i.sink_usec) < 0 || + pa_tagstruct_get_usec(t, &i.source_usec) < 0 || pa_tagstruct_get_boolean(t, &i.playing) < 0 || pa_tagstruct_getu32(t, &i.queue_length) < 0 || pa_tagstruct_get_timeval(t, &local) < 0 || pa_tagstruct_get_timeval(t, &remote) < 0 || + pa_tagstruct_getu64(t, &i.counter) < 0 || !pa_tagstruct_eof(t)) { pa_context_fail(o->context, PA_ERROR_PROTOCOL); goto finish; - } else - p = &i; - - gettimeofday(&now, NULL); - - if (pa_timeval_cmp(&local, &remote) < 0 && pa_timeval_cmp(&remote, &now)) - /* local and remote seem to have synchronized clocks */ - i.transport_usec = pa_timeval_diff(&remote, &local); - else - /* clocks are not synchronized, let's estimate latency then */ - i.transport_usec = pa_timeval_diff(&now, &local)/2; + } else { + gettimeofday(&now, NULL); + + if (pa_timeval_cmp(&local, &remote) < 0 && pa_timeval_cmp(&remote, &now)) { + /* local and remote seem to have synchronized clocks */ + + if (o->stream->direction == PA_STREAM_PLAYBACK) + i.transport_usec = pa_timeval_diff(&remote, &local); + else + i.transport_usec = pa_timeval_diff(&now, &remote); + + i.synchronized_clocks = 1; + i.timestamp = remote; + } else { + /* clocks are not synchronized, let's estimate latency then */ + i.transport_usec = pa_timeval_diff(&now, &local)/2; + i.synchronized_clocks = 0; + i.timestamp = local; + pa_timeval_add(&i.timestamp, i.transport_usec); + } + + if (o->stream->interpolate) { + o->stream->ipol_timestamp = i.timestamp; + o->stream->ipol_usec = pa_stream_get_time(o->stream, &i); + } + p = &i; + } + if (o->callback) { void (*cb)(struct pa_stream *s, const struct pa_latency_info *i, void *userdata) = o->callback; cb(o->stream, p, o->userdata); @@ -364,11 +437,12 @@ finish: pa_operation_unref(o); } -struct pa_operation* pa_stream_get_latency(struct pa_stream *s, void (*cb)(struct pa_stream *p, const struct pa_latency_info*i, void *userdata), void *userdata) { +struct pa_operation* pa_stream_get_latency_info(struct pa_stream *s, void (*cb)(struct pa_stream *p, const struct pa_latency_info*i, void *userdata), void *userdata) { uint32_t tag; struct pa_operation *o; struct pa_tagstruct *t; struct timeval now; + assert(s && s->direction != PA_STREAM_UPLOAD); o = pa_operation_new(s->context, s); assert(o); @@ -377,15 +451,16 @@ struct pa_operation* pa_stream_get_latency(struct pa_stream *s, void (*cb)(struc t = pa_tagstruct_new(NULL, 0); assert(t); - pa_tagstruct_putu32(t, PA_COMMAND_GET_PLAYBACK_LATENCY); + pa_tagstruct_putu32(t, s->direction == PA_STREAM_PLAYBACK ? PA_COMMAND_GET_PLAYBACK_LATENCY : PA_COMMAND_GET_RECORD_LATENCY); pa_tagstruct_putu32(t, tag = s->context->ctag++); pa_tagstruct_putu32(t, s->channel); gettimeofday(&now, NULL); pa_tagstruct_put_timeval(t, &now); + pa_tagstruct_putu64(t, s->counter); pa_pstream_send_tagstruct(s->context->pstream, t); - pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_get_latency_callback, o); + pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, stream_get_latency_info_callback, o); return pa_operation_ref(o); } @@ -485,6 +560,15 @@ struct pa_operation* pa_stream_cork(struct pa_stream *s, int b, void (*cb) (stru uint32_t tag; assert(s && s->ref >= 1 && s->state == PA_STREAM_READY); + if (s->interpolate) { + if (!s->corked && b) + s->ipol_usec = pa_stream_get_interpolated_time(s); + else if (s->corked && !b) + gettimeofday(&s->ipol_timestamp, NULL); + } + + s->corked = b; + o = pa_operation_new(s->context, s); assert(o); o->callback = cb; @@ -492,13 +576,15 @@ struct pa_operation* pa_stream_cork(struct pa_stream *s, int b, void (*cb) (stru t = pa_tagstruct_new(NULL, 0); assert(t); - pa_tagstruct_putu32(t, PA_COMMAND_CORK_PLAYBACK_STREAM); + pa_tagstruct_putu32(t, s->direction == PA_STREAM_PLAYBACK ? PA_COMMAND_CORK_PLAYBACK_STREAM : PA_COMMAND_CORK_RECORD_STREAM); pa_tagstruct_putu32(t, tag = s->context->ctag++); pa_tagstruct_putu32(t, s->channel); - pa_tagstruct_putu32(t, !!b); + pa_tagstruct_put_boolean(t, !!b); pa_pstream_send_tagstruct(s->context->pstream, t); pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, pa_stream_simple_ack_callback, o); + pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); + return pa_operation_ref(o); } @@ -522,11 +608,156 @@ struct pa_operation* pa_stream_send_simple_command(struct pa_stream *s, uint32_t return pa_operation_ref(o); } - struct pa_operation* pa_stream_flush(struct pa_stream *s, void (*cb)(struct pa_stream *s, int success, void *userdata), void *userdata) { - return pa_stream_send_simple_command(s, PA_COMMAND_FLUSH_PLAYBACK_STREAM, cb, userdata); + struct pa_operation *o; + o = pa_stream_send_simple_command(s, s->direction == PA_STREAM_PLAYBACK ? PA_COMMAND_FLUSH_PLAYBACK_STREAM : PA_COMMAND_FLUSH_RECORD_STREAM, cb, userdata); + pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); + return o; +} + +struct pa_operation* pa_stream_prebuf(struct pa_stream *s, void (*cb)(struct pa_stream *s, int success, void *userdata), void *userdata) { + struct pa_operation *o; + o = pa_stream_send_simple_command(s, PA_COMMAND_PREBUF_PLAYBACK_STREAM, cb, userdata); + pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); + return o; } struct pa_operation* pa_stream_trigger(struct pa_stream *s, void (*cb)(struct pa_stream *s, int success, void *userdata), void *userdata) { - return pa_stream_send_simple_command(s, PA_COMMAND_TRIGGER_PLAYBACK_STREAM, cb, userdata); + struct pa_operation *o; + o = pa_stream_send_simple_command(s, PA_COMMAND_TRIGGER_PLAYBACK_STREAM, cb, userdata); + pa_operation_unref(pa_stream_get_latency_info(s, NULL, NULL)); + return o; +} + +struct pa_operation* pa_stream_set_name(struct pa_stream *s, const char *name, void(*cb)(struct pa_stream*c, int success, void *userdata), void *userdata) { + struct pa_operation *o; + struct pa_tagstruct *t; + uint32_t tag; + assert(s && s->ref >= 1 && s->state == PA_STREAM_READY && name && s->direction != PA_STREAM_UPLOAD); + + o = pa_operation_new(s->context, s); + assert(o); + o->callback = cb; + o->userdata = userdata; + + t = pa_tagstruct_new(NULL, 0); + assert(t); + pa_tagstruct_putu32(t, s->direction == PA_STREAM_RECORD ? PA_COMMAND_SET_RECORD_STREAM_NAME : PA_COMMAND_SET_PLAYBACK_STREAM_NAME); + pa_tagstruct_putu32(t, tag = s->context->ctag++); + pa_tagstruct_putu32(t, s->channel); + pa_tagstruct_puts(t, name); + pa_pstream_send_tagstruct(s->context->pstream, t); + pa_pdispatch_register_reply(s->context->pdispatch, tag, DEFAULT_TIMEOUT, pa_stream_simple_ack_callback, o); + + return pa_operation_ref(o); +} + +uint64_t pa_stream_get_counter(struct pa_stream *s) { + assert(s); + return s->counter; +} + +pa_usec_t pa_stream_get_time(struct pa_stream *s, const struct pa_latency_info *i) { + pa_usec_t usec; + assert(s); + + usec = pa_bytes_to_usec(i->counter, &s->sample_spec); + + if (i) { + if (s->direction == PA_STREAM_PLAYBACK) { + pa_usec_t latency = i->transport_usec + i->buffer_usec + i->sink_usec; + if (usec < latency) + usec = 0; + else + usec -= latency; + + } else if (s->direction == PA_STREAM_RECORD) { + usec += i->source_usec + i->buffer_usec + i->transport_usec; + + if (usec > i->sink_usec) + usec -= i->sink_usec; + else + usec = 0; + } + } + + if (usec < s->previous_time) + usec = s->previous_time; + + s->previous_time = usec; + + return usec; +} + +static pa_usec_t time_counter_diff(struct pa_stream *s, pa_usec_t t, pa_usec_t c, int *negative) { + assert(s); + + if (negative) + *negative = 0; + + if (c < t) { + if (s->direction == PA_STREAM_RECORD) { + if (negative) + *negative = 1; + + return t-c; + } else + return 0; + } else + return c-t; +} + +pa_usec_t pa_stream_get_latency(struct pa_stream *s, const struct pa_latency_info *i, int *negative) { + pa_usec_t t, c; + assert(s && i); + + t = pa_stream_get_time(s, i); + c = pa_bytes_to_usec(s->counter, &s->sample_spec); + + return time_counter_diff(s, t, c, negative); +} + +const struct pa_sample_spec* pa_stream_get_sample_spec(struct pa_stream *s) { + assert(s); + return &s->sample_spec; +} + +void pa_stream_trash_ipol(struct pa_stream *s) { + assert(s); + + if (!s->interpolate) + return; + + memset(&s->ipol_timestamp, 0, sizeof(s->ipol_timestamp)); + s->ipol_usec = 0; +} + +pa_usec_t pa_stream_get_interpolated_time(struct pa_stream *s) { + pa_usec_t usec; + assert(s && s->interpolate); + + if (s->corked) + usec = s->ipol_usec; + else { + if (s->ipol_timestamp.tv_sec == 0) + usec = 0; + else + usec = s->ipol_usec + pa_timeval_age(&s->ipol_timestamp); + } + + if (usec < s->previous_time) + usec = s->previous_time; + + s->previous_time = usec; + return usec; +} + +pa_usec_t pa_stream_get_interpolated_latency(struct pa_stream *s, int *negative) { + pa_usec_t t, c; + assert(s && s->interpolate); + + t = pa_stream_get_interpolated_time(s); + c = pa_bytes_to_usec(s->counter, &s->sample_spec); + + return time_counter_diff(s, t, c, negative); }