From b363832c2ccc66b2edbd9298924af59664e20716 Mon Sep 17 00:00:00 2001 From: Matej Knopp Date: Sat, 14 Sep 2013 15:56:04 +0200 Subject: [PATCH] qtmux: set first_ts to DTS for streams that have DTS https://bugzilla.gnome.org/show_bug.cgi?id=707340 --- gst/isomp4/gstqtmux.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gst/isomp4/gstqtmux.c b/gst/isomp4/gstqtmux.c index dba3aaf..e920d4e 100644 --- a/gst/isomp4/gstqtmux.c +++ b/gst/isomp4/gstqtmux.c @@ -2176,12 +2176,20 @@ gst_qt_mux_add_buffer (GstQTMux * qtmux, GstQTPad * pad, GstBuffer * buf) /* if this is the first buffer, store the timestamp */ if (G_UNLIKELY (pad->first_ts == GST_CLOCK_TIME_NONE) && last_buf) { - if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_PTS (last_buf))) { + if (pad->have_dts) { + /* first pad always has DTS. If it was not provided by upstream it was set to segment start */ + pad->first_ts = GST_BUFFER_DTS (last_buf); + } else if (GST_BUFFER_PTS_IS_VALID (last_buf)) { pad->first_ts = GST_BUFFER_PTS (last_buf); + } + + if (GST_CLOCK_TIME_IS_VALID (pad->first_ts)) { GST_DEBUG ("setting first_ts to %" G_GUINT64_FORMAT, pad->first_ts); + last_buf = gst_buffer_make_writable (last_buf); check_and_subtract_ts (qtmux, &GST_BUFFER_DTS (last_buf), pad->first_ts); check_and_subtract_ts (qtmux, &GST_BUFFER_PTS (last_buf), pad->first_ts); if (buf) { + buf = gst_buffer_make_writable (buf); check_and_subtract_ts (qtmux, &GST_BUFFER_DTS (buf), pad->first_ts); check_and_subtract_ts (qtmux, &GST_BUFFER_PTS (buf), pad->first_ts); } -- 2.7.4