mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtmux: also track original PTS buffer timestamp in reorder dts-method

Browse source
This commit is contained in:
Mark Nauwelaerts 2011-03-10 16:02:42 +01:00 committed by Tim-Philipp Müller
parent 0a884e5620
commit 31c26a4551
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/quicktime/gstqtmux.c
View file

@ -2028,6 +2028,8 @@ gst_qt_mux_get_asc_buffer_ts (GstQTMux * qtmux, GstQTPad * pad, GstBuffer * buf)
pad->buf_entries[pad->buf_head++] = NULL; pad->buf_entries[pad->buf_head++] = NULL;
pad->buf_head %= wrap; pad->buf_head %= wrap;
buf = gst_buffer_make_metadata_writable (buf); buf = gst_buffer_make_metadata_writable (buf);
/* track original ts (= pts ?) for later */
GST_BUFFER_OFFSET_END (buf) = GST_BUFFER_TIMESTAMP (buf);
GST_BUFFER_TIMESTAMP (buf) = ts; GST_BUFFER_TIMESTAMP (buf) = ts;
GST_DEBUG_OBJECT (qtmux, "next buffer uses reordered ts %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (qtmux, "next buffer uses reordered ts %" GST_TIME_FORMAT,
GST_TIME_ARGS (ts)); GST_TIME_ARGS (ts));
@ -2105,7 +2107,7 @@ again:
* - collect some buffers and re-order timestamp, * - collect some buffers and re-order timestamp,
* then process the oldest buffer with smallest timestamps. * then process the oldest buffer with smallest timestamps.
* This should typically compensate for some codec's handywork with ts. * This should typically compensate for some codec's handywork with ts.
* ... but in case this makes ts end up where not expected: * ... but in case this makes ts end up where not expected, in DTS_METHOD_ASC:
* - keep each ts with its buffer and still keep a list of most recent X ts, * - keep each ts with its buffer and still keep a list of most recent X ts,
* use the (ascending) minimum of those as DTS (and the difference as ts delta), * use the (ascending) minimum of those as DTS (and the difference as ts delta),
* and use this DTS as a basis to obtain a (positive) CTS offset. * and use this DTS as a basis to obtain a (positive) CTS offset.
@ -2273,7 +2275,9 @@ again:
if ((pad->have_dts || qtmux->guess_pts) && pad->is_out_of_order) { if ((pad->have_dts || qtmux->guess_pts) && pad->is_out_of_order) {
guint64 pts; guint64 pts;
pts = gst_util_uint64_scale_round (GST_BUFFER_TIMESTAMP (last_buf), pts = qtmux->dts_method == DTS_METHOD_REORDER ?
GST_BUFFER_OFFSET_END (last_buf) : GST_BUFFER_TIMESTAMP (last_buf);
pts = gst_util_uint64_scale_round (pts,
atom_trak_get_timescale (pad->trak), GST_SECOND); atom_trak_get_timescale (pad->trak), GST_SECOND);
pts_offset = (gint64) (pts - last_dts); pts_offset = (gint64) (pts - last_dts);
do_pts = TRUE; do_pts = TRUE;