From 65d7dd9c60ae69f94f111397b7caa1b7f816da30 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Thu, 28 Sep 2006 21:44:49 +0000 Subject: [PATCH] gst/dvdlpcmdec/gstdvdlpcmdec.c: If an incoming timestamp is within one sample of our current timestamp, then keep it.... Original commit message from CVS: * gst/dvdlpcmdec/gstdvdlpcmdec.c: (update_timestamps): If an incoming timestamp is within one sample of our current timestamp, then keep it. This prevents imprecision in the PTS (which only has 90khz granularity) from affecting our stream. --- ChangeLog | 7 +++++++ common | 2 +- gst/dvdlpcmdec/gstdvdlpcmdec.c | 22 ++++++++++++++++++---- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb4b37b826..becc43e618 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-09-28 Jan Schmidt + + * gst/dvdlpcmdec/gstdvdlpcmdec.c: (update_timestamps): + If an incoming timestamp is within one sample of our current + timestamp, then keep it. This prevents imprecision in the + PTS (which only has 90khz granularity) from affecting our stream. + 2006-09-28 Tim-Philipp Müller * gst/mpegstream/gstmpegparse.c: (gst_mpeg_parse_handle_src_query): diff --git a/common b/common index a8c15b7a2c..bdd0108b35 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a8c15b7a2c75fc2bd83850cb17cb05a1ee84ecaf +Subproject commit bdd0108b3540ffadeb82cee28b8867a8a6e7ae78 diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c index 15a05965c9..2c5831b96a 100644 --- a/gst/dvdlpcmdec/gstdvdlpcmdec.c +++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c @@ -259,16 +259,30 @@ caps_parse_error: static void update_timestamps (GstDvdLpcmDec * dvdlpcmdec, GstBuffer * buf, int samples) { + gboolean take_buf_ts = FALSE; + GST_BUFFER_DURATION (buf) = gst_util_uint64_scale (samples, GST_SECOND, dvdlpcmdec->rate); if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) { - /* Then leave it as-is, and save this timestamp */ + if (GST_CLOCK_TIME_IS_VALID (dvdlpcmdec->timestamp)) { + GstClockTimeDiff one_sample = GST_SECOND / dvdlpcmdec->rate; + GstClockTimeDiff diff = GST_CLOCK_DIFF (GST_BUFFER_TIMESTAMP (buf), + dvdlpcmdec->timestamp); + + if (diff > one_sample || diff < -one_sample) + take_buf_ts = TRUE; + } else { + take_buf_ts = TRUE; + } + } else if (!GST_CLOCK_TIME_IS_VALID (dvdlpcmdec->timestamp)) { + dvdlpcmdec->timestamp = dvdlpcmdec->segment_start; + } + + if (take_buf_ts) { + /* Take buffer timestamp */ dvdlpcmdec->timestamp = GST_BUFFER_TIMESTAMP (buf); } else { - if (!GST_CLOCK_TIME_IS_VALID (dvdlpcmdec->timestamp)) - dvdlpcmdec->timestamp = dvdlpcmdec->segment_start; - GST_BUFFER_TIMESTAMP (buf) = dvdlpcmdec->timestamp; }