mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 04:26:14 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Handle negative composition offsets in the trun box the same way as for non-fragmented streams

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1294>
This commit is contained in:
Sebastian Dröge 2021-11-02 18:29:53 +02:00 committed by GStreamer Marge Bot
parent 767e8bf668
commit bb5a5ae8a8
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View file

@ -3210,6 +3210,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
GstClockTime gst_ts = GST_CLOCK_TIME_NONE; GstClockTime gst_ts = GST_CLOCK_TIME_NONE;
guint64 timestamp; guint64 timestamp;
gint32 data_offset = 0; gint32 data_offset = 0;
guint8 version;
guint32 flags = 0, first_flags = 0, samples_count = 0; guint32 flags = 0, first_flags = 0, samples_count = 0;
gint i; gint i;
guint8 *data; guint8 *data;
@ -3217,6 +3218,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
QtDemuxSample *sample; QtDemuxSample *sample;
gboolean ismv = FALSE; gboolean ismv = FALSE;
gint64 initial_offset; gint64 initial_offset;
gint32 min_ct = 0;
GST_LOG_OBJECT (qtdemux, "parsing trun track-id %d; " GST_LOG_OBJECT (qtdemux, "parsing trun track-id %d; "
"default dur %d, size %d, flags 0x%x, base offset %" G_GINT64_FORMAT ", " "default dur %d, size %d, flags 0x%x, base offset %" G_GINT64_FORMAT ", "
@ -3236,7 +3238,7 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
stream->all_keyframe = TRUE; stream->all_keyframe = TRUE;
} }
if (!gst_byte_reader_skip (trun, 1) || if (!gst_byte_reader_get_uint8 (trun, &version) ||
!gst_byte_reader_get_uint24_be (trun, &flags)) !gst_byte_reader_get_uint24_be (trun, &flags))
goto fail; goto fail;
@ -3392,7 +3394,8 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
sample = stream->samples + stream->n_samples; sample = stream->samples + stream->n_samples;
for (i = 0; i < samples_count; i++) { for (i = 0; i < samples_count; i++) {
guint32 dur, size, sflags, ct; guint32 dur, size, sflags;
gint32 ct;
/* first read sample data */ /* first read sample data */
if (flags & TR_SAMPLE_DURATION) { if (flags & TR_SAMPLE_DURATION) {
@ -3416,7 +3419,11 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
} else { } else {
sflags = d_sample_flags; sflags = d_sample_flags;
} }
if (flags & TR_COMPOSITION_TIME_OFFSETS) { if (flags & TR_COMPOSITION_TIME_OFFSETS) {
/* Read offsets as signed numbers regardless of trun version as very
* high offsets are unlikely and there are files out there that use
* version=0 truns with negative offsets */
ct = QT_UINT32 (data + ct_offset); ct = QT_UINT32 (data + ct_offset);
} else { } else {
ct = 0; ct = 0;
@ -3437,8 +3444,20 @@ qtdemux_parse_trun (GstQTDemux * qtdemux, GstByteReader * trun,
timestamp += dur; timestamp += dur;
stream->duration_moof += dur; stream->duration_moof += dur;
sample++; sample++;
if (ct < min_ct)
min_ct = ct;
} }
/* Shift PTS/DTS to allow for negative composition offsets while keeping
* A/V sync in place. This is similar to the code handling ctts/cslg in the
* non-fragmented case.
*/
if (min_ct < 0)
stream->cslg_shift = -min_ct;
else
stream->cslg_shift = 0;
/* Update total duration if needed */ /* Update total duration if needed */
check_update_duration (qtdemux, QTSTREAMTIME_TO_GSTTIME (stream, timestamp)); check_update_duration (qtdemux, QTSTREAMTIME_TO_GSTTIME (stream, timestamp));