summaryrefslogtreecommitdiffstats
path: root/polyp/protocol-esound.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-09-16 00:05:56 +0000
committerLennart Poettering <lennart@poettering.net>2004-09-16 00:05:56 +0000
commitf9e2058820c2a51994708ad11d1ed8e09b12b8b1 (patch)
tree5277545f0b8b9534590d20c32d0d3e1acc2a9982 /polyp/protocol-esound.c
parentf5d47a293aa32a8273ef02c597cb263527726465 (diff)
add input latency measurement
add GETOSPACE support to module-oss git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@205 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/protocol-esound.c')
-rw-r--r--polyp/protocol-esound.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/polyp/protocol-esound.c b/polyp/protocol-esound.c
index 5abe474d..aff45099 100644
--- a/polyp/protocol-esound.c
+++ b/polyp/protocol-esound.c
@@ -107,6 +107,7 @@ static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk
static int sink_input_peek_cb(struct pa_sink_input *i, struct pa_memchunk *chunk);
static void sink_input_kill_cb(struct pa_sink_input *i);
static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i);
+static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o);
static void source_output_push_cb(struct pa_source_output *o, const struct pa_memchunk *chunk);
static void source_output_kill_cb(struct pa_source_output *o);
@@ -374,6 +375,7 @@ static int esd_proto_stream_record(struct connection *c, esd_proto_t request, co
c->source_output->client = c->client;
c->source_output->push = source_output_push_cb;
c->source_output->kill = source_output_kill_cb;
+ c->source_output->get_latency = source_output_get_latency_cb;
c->source_output->userdata = c;
c->state = ESD_STREAMING_DATA;
@@ -919,7 +921,6 @@ static void sink_input_kill_cb(struct pa_sink_input *i) {
connection_free((struct connection *) i->userdata);
}
-
static pa_usec_t sink_input_get_latency_cb(struct pa_sink_input *i) {
struct connection*c = i->userdata;
assert(i && c);
@@ -944,6 +945,12 @@ static void source_output_kill_cb(struct pa_source_output *o) {
connection_free((struct connection *) o->userdata);
}
+static pa_usec_t source_output_get_latency_cb(struct pa_source_output *o) {
+ struct connection*c = o->userdata;
+ assert(o && c);
+ return pa_bytes_to_usec(pa_memblockq_get_length(c->output_memblockq), &c->source_output->sample_spec);
+}
+
/*** socket server callback ***/
static void on_connection(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata) {