add input latency measurement

[pulseaudio] / polyp / protocol-esound.c

diff --git a/polyp/protocol-esound.c b/polyp/protocol-esound.c
index 8ec48a3424b5ecca66886b3490d666a19f8ca847..aff45099227e4f6bff2d3e17c72e5ef47359d2a8 100644 (file)
--- 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);
@@ -293,7 +294,7 @@ static int esd_proto_stream_play(struct connection *c, esd_proto_t request, cons
     strncpy(name, (char*) data + sizeof(int)*2, sizeof(name));
     name[sizeof(name)-1] = 0;
 
-    pa_client_rename(c->client, name);
+    pa_client_set_name(c->client, name);
 
     assert(!c->input_memblockq);
 
@@ -357,7 +358,7 @@ static int esd_proto_stream_record(struct connection *c, esd_proto_t request, co
     strncpy(name, (char*) data + sizeof(int)*2, sizeof(name));
     name[sizeof(name)-1] = 0;
 
-    pa_client_rename(c->client, name);
+    pa_client_set_name(c->client, name);
 
     assert(!c->output_memblockq);
 
@@ -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) {