mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-12 02:15:31 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtmux: Don't calculate PTS offset and DTS with GST_CLOCK_TIME_NONE

Browse source 
Just error out if there is no valid PTS.

https://bugzilla.gnome.org/show_bug.cgi?id=772143
This commit is contained in:
Sebastian Dröge 2016-09-28 23:03:58 +03:00
parent 52879dacbc
commit a993883b74
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gst/isomp4/gstqtmux.c
View file

@ -3302,13 +3302,15 @@ gst_qt_mux_add_buffer (GstQTMux * qtmux, GstQTPad * pad, GstBuffer * buf)
sync = TRUE; sync = TRUE;
} }
if (GST_CLOCK_TIME_IS_VALID (GST_BUFFER_DTS (last_buf))) { if (!GST_BUFFER_PTS_IS_VALID (last_buf))
goto no_pts;
if (GST_BUFFER_DTS_IS_VALID (last_buf)) {
last_dts = gst_util_uint64_scale_round (GST_BUFFER_DTS (last_buf), last_dts = gst_util_uint64_scale_round (GST_BUFFER_DTS (last_buf),
atom_trak_get_timescale (pad->trak), GST_SECOND); atom_trak_get_timescale (pad->trak), GST_SECOND);
pts_offset = pts_offset =
(gint64) (gst_util_uint64_scale_round (GST_BUFFER_PTS (last_buf), (gint64) (gst_util_uint64_scale_round (GST_BUFFER_PTS (last_buf),
atom_trak_get_timescale (pad->trak), GST_SECOND) - last_dts); atom_trak_get_timescale (pad->trak), GST_SECOND) - last_dts);
} else { } else {
pts_offset = 0; pts_offset = 0;
last_dts = gst_util_uint64_scale_round (GST_BUFFER_PTS (last_buf), last_dts = gst_util_uint64_scale_round (GST_BUFFER_PTS (last_buf),
@ -3388,6 +3390,11 @@ fragmented_sample:
("Audio buffer contains fragmented sample.")); ("Audio buffer contains fragmented sample."));
goto bail; goto bail;
} }
no_pts:
{
GST_ELEMENT_ERROR (qtmux, STREAM, MUX, (NULL), ("Buffer has no PTS."));
goto bail;
}
not_negotiated: not_negotiated:
{ {
GST_ELEMENT_ERROR (qtmux, CORE, NEGOTIATION, (NULL), GST_ELEMENT_ERROR (qtmux, CORE, NEGOTIATION, (NULL),