summaryrefslogtreecommitdiffstats
path: root/polyp/sink-input.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2004-09-13 13:26:44 +0000
committerLennart Poettering <lennart@poettering.net>2004-09-13 13:26:44 +0000
commitfbefe67d52eb89a429505c653d1ea4ce73d4f4e7 (patch)
tree662d7e8eb69b53a632353a742c7e5a4c9d70682d /polyp/sink-input.c
parent12315982066ee1044840b598624920f8028c7924 (diff)
correct latency calculation
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@197 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/sink-input.c')
-rw-r--r--polyp/sink-input.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/polyp/sink-input.c b/polyp/sink-input.c
index b0096182..7763f261 100644
--- a/polyp/sink-input.c
+++ b/polyp/sink-input.c
@@ -112,12 +112,16 @@ void pa_sink_input_kill(struct pa_sink_input*i) {
}
pa_usec_t pa_sink_input_get_latency(struct pa_sink_input *i) {
+ pa_usec_t r = 0;
assert(i);
if (i->get_latency)
- return i->get_latency(i);
+ r += i->get_latency(i);
- return 0;
+ if (i->resampled_chunk.memblock)
+ r += pa_bytes_to_usec(i->resampled_chunk.length, &i->sample_spec);
+
+ return r;
}
int pa_sink_input_peek(struct pa_sink_input *i, struct pa_memchunk *chunk) {