From 44cc3421a058ab8cb871b2510783efd61e29b2e8 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Wed, 31 Aug 2005 10:57:35 +0000 Subject: [PATCH] gst-libs/gst/audio/gstbaseaudiosink.c: Resync if the buffer timestamps drift more than a 10th of a second. Original commit message from CVS: * gst-libs/gst/audio/gstbaseaudiosink.c: (gst_base_audio_sink_render): Resync if the buffer timestamps drift more than a 10th of a second. --- ChangeLog | 7 +++++++ gst-libs/gst/audio/gstbaseaudiosink.c | 16 ++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index af83715547..ce5dd345c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-08-31 Wim Taymans + + * gst-libs/gst/audio/gstbaseaudiosink.c: + (gst_base_audio_sink_render): + Resync if the buffer timestamps drift more than a 10th + of a second. + 2005-08-31 Tim-Philipp Müller * sys/v4l/gstv4lsrc.c: (gst_v4lsrc_set_property), diff --git a/gst-libs/gst/audio/gstbaseaudiosink.c b/gst-libs/gst/audio/gstbaseaudiosink.c index 46813f5679..f8b1d7eccb 100644 --- a/gst-libs/gst/audio/gstbaseaudiosink.c +++ b/gst-libs/gst/audio/gstbaseaudiosink.c @@ -335,6 +335,8 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf) GstClockTimeDiff render_diff; GstBaseAudioSink *sink = GST_BASE_AUDIO_SINK (bsink); gint64 diff; + guint8 *data; + guint size; /* can't do anything when we don't have the device */ if (!gst_ring_buffer_is_acquired (sink->ringbuffer)) @@ -342,6 +344,8 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf) in_offset = GST_BUFFER_OFFSET (buf); time = GST_BUFFER_TIMESTAMP (buf); + data = GST_BUFFER_DATA (buf); + size = GST_BUFFER_SIZE (buf); GST_DEBUG ("time %" GST_TIME_FORMAT ", offset %llu, start %" GST_TIME_FORMAT, GST_TIME_ARGS (time), in_offset, GST_TIME_ARGS (bsink->segment_start)); @@ -367,16 +371,16 @@ gst_base_audio_sink_render (GstBaseSink * bsink, GstBuffer * buf) GST_DEBUG ("render time %" GST_TIME_FORMAT ", render offset %llu, diff %lld", GST_TIME_ARGS (render_time), render_offset, diff); - /* FIXME, depends on samplerate... Also the purpose of the OFFSET fields - * are to detect gaps and dropouts, we might better use them if they are - * valid. */ - if (diff < 10) { + /* we tollerate a 10th of a second diff before we start resyncing. This + * should be enough to compensate for various rounding errors in the timestamp + * and sample offset position. */ + if (diff < sink->ringbuffer->spec.rate / 10) { /* just align with previous sample then */ render_offset = -1; + /* FIXME, can we use the OFFSET field to detect a gap? */ } - gst_ring_buffer_commit (sink->ringbuffer, render_offset, - GST_BUFFER_DATA (buf), GST_BUFFER_SIZE (buf)); + gst_ring_buffer_commit (sink->ringbuffer, render_offset, data, size); return GST_FLOW_OK;