summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-01-05 19:30:59 +0000
committerPierre Ossman <ossman@cendio.se>2006-01-05 19:30:59 +0000
commit59aa6ca514101d50dea7bd56147a6984b8abb3bf (patch)
tree141c0b2b0b87198b15f75b8059e24b6be704aaf9
parentec87cb1571c293ff40b1191796c71275b6564694 (diff)
There was a race condition here that caused latency calculation to fail
miserably under some conditions. git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/ossman@392 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--polyp/polyplib-internal.h1
-rw-r--r--polyp/polyplib-stream.c10
2 files changed, 0 insertions, 11 deletions
diff --git a/polyp/polyplib-internal.h b/polyp/polyplib-internal.h
index d1b3a27f..9417430f 100644
--- a/polyp/polyplib-internal.h
+++ b/polyp/polyplib-internal.h
@@ -92,7 +92,6 @@ struct pa_stream {
enum pa_stream_direction direction;
uint32_t requested_bytes;
uint64_t counter;
- pa_usec_t previous_time;
enum pa_stream_state state;
struct pa_mcalign *mcalign;
diff --git a/polyp/polyplib-stream.c b/polyp/polyplib-stream.c
index d4480f8c..c7c40c0d 100644
--- a/polyp/polyplib-stream.c
+++ b/polyp/polyplib-stream.c
@@ -65,7 +65,6 @@ struct pa_stream *pa_stream_new(struct pa_context *c, const char *name, const st
s->mcalign = pa_mcalign_new(pa_frame_size(ss), c->memblock_stat);
s->counter = 0;
- s->previous_time = 0;
s->corked = 0;
s->interpolate = 0;
@@ -698,11 +697,6 @@ pa_usec_t pa_stream_get_time(struct pa_stream *s, const struct pa_latency_info *
}
}
- if (usec < s->previous_time)
- usec = s->previous_time;
-
- s->previous_time = usec;
-
return usec;
}
@@ -762,10 +756,6 @@ pa_usec_t pa_stream_get_interpolated_time(struct pa_stream *s) {
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;
}