From f0f2b133ddd2c423f037d17b365aa9e2ec9afc91 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 26 Aug 2005 17:35:28 +0000 Subject: [PATCH] use base class' newsegment to properly timestamp Original commit message from CVS: use base class' newsegment to properly timestamp --- ChangeLog | 5 +++++ gst/audioresample/gstaudioresample.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3674e524ba..c82f89f240 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-26 Thomas Vander Stichele + + * gst/audioresample/gstaudioresample.c: + use base class' newsegment to properly timestamp + 2005-08-26 Wim Taymans * gst/audioconvert/audioconvert.c: (if), (float), diff --git a/gst/audioresample/gstaudioresample.c b/gst/audioresample/gstaudioresample.c index 02537075eb..79a4d285b6 100644 --- a/gst/audioresample/gstaudioresample.c +++ b/gst/audioresample/gstaudioresample.c @@ -295,9 +295,12 @@ gboolean } else { /* take a best guess, this is called cheating */ *othersize = floor (size * state->i_rate / state->o_rate); + *othersize -= *othersize % state->sample_size; } *othersize += state->sample_size; + g_assert (*othersize % state->sample_size == 0); + /* we make room for one extra sample, given that the resampling filter * can output an extra one for non-integral i_rate/o_rate */ GST_DEBUG_OBJECT (base, "transformed size %d to %d", size, *othersize); @@ -396,7 +399,7 @@ static GstFlowReturn outsize, outsamples); GST_BUFFER_OFFSET (outbuf) = audioresample->offset; - GST_BUFFER_TIMESTAMP (outbuf) = + GST_BUFFER_TIMESTAMP (outbuf) = base->segment_start + audioresample->offset * GST_SECOND / audioresample->o_rate; audioresample->offset += outsamples; @@ -405,7 +408,7 @@ static GstFlowReturn /* we calculate DURATION as the difference between "next" timestamp * and current timestamp so we ensure a contiguous stream, instead of * having rounding errors. */ - GST_BUFFER_DURATION (outbuf) = + GST_BUFFER_DURATION (outbuf) = base->segment_start + audioresample->offset * GST_SECOND / audioresample->o_rate - GST_BUFFER_TIMESTAMP (outbuf);