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

qtdemux: Parsing elst box based on version

Browse source 
segment_duration and media_time should be parsed based on version
of elst box. Specification defines that an elst box with version 1
has uint64 and int64 values for segment_duration and media_time,
respectively.

https://bugzilla.gnome.org/show_bug.cgi?id=766301
This commit is contained in:
Seungha Yang 2016-05-12 11:52:09 +09:00 committed by Sebastian Dröge
parent 325741d37d
commit 56e273bc21
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst/isomp4/qtdemux.c
View file

@ -8423,10 +8423,11 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
if ((edts = qtdemux_tree_get_child_by_type (trak, FOURCC_edts))) { if ((edts = qtdemux_tree_get_child_by_type (trak, FOURCC_edts))) {
GNode *elst; GNode *elst;
gint n_segments; gint n_segments;
gint i, count; gint i, count, entry_size;
guint64 time; guint64 time;
GstClockTime stime; GstClockTime stime;
guint8 *buffer; guint8 *buffer;
guint8 version;
GST_DEBUG_OBJECT (qtdemux, "looking for edit list"); GST_DEBUG_OBJECT (qtdemux, "looking for edit list");
if (!(elst = qtdemux_tree_get_child_by_type (edts, FOURCC_elst))) if (!(elst = qtdemux_tree_get_child_by_type (edts, FOURCC_elst)))
@ -8434,6 +8435,9 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
buffer = elst->data; buffer = elst->data;
version = QT_UINT8 (buffer + 8);
entry_size = (version == 1) ? 20 : 12;
n_segments = QT_UINT32 (buffer + 12); n_segments = QT_UINT32 (buffer + 12);
/* we might allocate a bit too much, at least allocate 1 segment */ /* we might allocate a bit too much, at least allocate 1 segment */
@ -8446,14 +8450,24 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
for (i = 0; i < n_segments; i++) { for (i = 0; i < n_segments; i++) {
guint64 duration; guint64 duration;
guint64 media_time; guint64 media_time;
gboolean time_valid = TRUE;
QtDemuxSegment *segment; QtDemuxSegment *segment;
guint32 rate_int; guint32 rate_int;
GstClockTime media_start = GST_CLOCK_TIME_NONE; GstClockTime media_start = GST_CLOCK_TIME_NONE;
media_time = QT_UINT32 (buffer + 20 + i * 12); if (version == 1) {
duration = QT_UINT32 (buffer + 16 + i * 12); media_time = QT_UINT64 (buffer + 24 + i * entry_size);
duration = QT_UINT64 (buffer + 16 + i * entry_size);
if (media_time == G_MAXUINT64)
time_valid = FALSE;
} else {
media_time = QT_UINT32 (buffer + 20 + i * entry_size);
duration = QT_UINT32 (buffer + 16 + i * entry_size);
if (media_time == G_MAXUINT32)
time_valid = FALSE;
}
if (media_time != G_MAXUINT32) if (time_valid)
media_start = QTSTREAMTIME_TO_GSTTIME (stream, media_time); media_start = QTSTREAMTIME_TO_GSTTIME (stream, media_time);
segment = &stream->segments[count++]; segment = &stream->segments[count++];
@ -8469,7 +8483,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
/* zero duration does not imply media_start == media_stop /* zero duration does not imply media_start == media_stop
* but, only specify media_start.*/ * but, only specify media_start.*/
stime = QTTIME_TO_GSTTIME (qtdemux, qtdemux->duration); stime = QTTIME_TO_GSTTIME (qtdemux, qtdemux->duration);
if (GST_CLOCK_TIME_IS_VALID (stime) && media_time != G_MAXUINT32 if (GST_CLOCK_TIME_IS_VALID (stime) && time_valid
&& stime >= media_start) { && stime >= media_start) {
segment->duration = stime - media_start; segment->duration = stime - media_start;
} else { } else {
@ -8480,7 +8494,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
segment->trak_media_start = media_time; segment->trak_media_start = media_time;
/* media_time expressed in stream timescale */ /* media_time expressed in stream timescale */
if (media_time != G_MAXUINT32) { if (time_valid) {
segment->media_start = media_start; segment->media_start = media_start;
segment->media_stop = segment->media_start + segment->duration; segment->media_stop = segment->media_start + segment->duration;
media_segments_count++; media_segments_count++;
@ -8488,7 +8502,8 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
segment->media_start = GST_CLOCK_TIME_NONE; segment->media_start = GST_CLOCK_TIME_NONE;
segment->media_stop = GST_CLOCK_TIME_NONE; segment->media_stop = GST_CLOCK_TIME_NONE;
} }
rate_int = GST_READ_UINT32_BE (buffer + 24 + i * 12); rate_int =
QT_UINT32 (buffer + ((version == 1) ? 32 : 24) + i * entry_size);
if (rate_int <= 1) { if (rate_int <= 1) {
/* 0 is not allowed, some programs write 1 instead of the floating point /* 0 is not allowed, some programs write 1 instead of the floating point