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

qtdemux_parse_segments: remove superfluous variable

Browse source 
https://bugzilla.gnome.org/show_bug.cgi?id=793751
This commit is contained in:
Alicia Boya García 2018-02-23 13:38:32 +01:00 committed by Thibault Saunier
parent 87b2b35fac
commit c097289725
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/isomp4/qtdemux.c
View file

@ -9224,7 +9224,7 @@ 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, entry_size; gint segment_number, entry_size;
guint64 time; guint64 time;
GstClockTime stime; GstClockTime stime;
const guint8 *buffer; const guint8 *buffer;
@ -9259,9 +9259,8 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
/* segments always start from 0 */ /* segments always start from 0 */
time = 0; time = 0;
stime = 0; stime = 0;
count = 0;
buffer += 16; buffer += 16;
for (i = 0; i < n_segments; i++) { for (segment_number = 0; segment_number < n_segments; segment_number++) {
guint64 duration; guint64 duration;
guint64 media_time; guint64 media_time;
gboolean time_valid = TRUE; gboolean time_valid = TRUE;
@ -9284,7 +9283,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
if (time_valid) 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[segment_number];
/* time and duration expressed in global timescale */ /* time and duration expressed in global timescale */
segment->time = stime; segment->time = stime;
@ -9332,7 +9331,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
", duration %" GST_TIME_FORMAT ", media_start %" GST_TIME_FORMAT ", duration %" GST_TIME_FORMAT ", media_start %" GST_TIME_FORMAT
" (%" G_GUINT64_FORMAT ") , media_stop %" GST_TIME_FORMAT " (%" G_GUINT64_FORMAT ") , media_stop %" GST_TIME_FORMAT
" stop_time %" GST_TIME_FORMAT " rate %g, (%d) timescale %u", " stop_time %" GST_TIME_FORMAT " rate %g, (%d) timescale %u",
i, GST_TIME_ARGS (segment->time), segment_number, GST_TIME_ARGS (segment->time),
GST_TIME_ARGS (segment->duration), GST_TIME_ARGS (segment->duration),
GST_TIME_ARGS (segment->media_start), media_time, GST_TIME_ARGS (segment->media_start), media_time,
GST_TIME_ARGS (segment->media_stop), GST_TIME_ARGS (segment->media_stop),
@ -9342,15 +9341,16 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream,
GST_WARNING_OBJECT (qtdemux, "Segment %d " GST_WARNING_OBJECT (qtdemux, "Segment %d "
" extends to %" GST_TIME_FORMAT " extends to %" GST_TIME_FORMAT
" past the end of the file duration %" GST_TIME_FORMAT " past the end of the file duration %" GST_TIME_FORMAT
" it will be truncated", i, GST_TIME_ARGS (segment->stop_time), " it will be truncated", segment_number,
GST_TIME_ARGS (segment->stop_time),
GST_TIME_ARGS (qtdemux->segment.stop)); GST_TIME_ARGS (qtdemux->segment.stop));
qtdemux->segment.stop = segment->stop_time; qtdemux->segment.stop = segment->stop_time;
} }
buffer += entry_size; buffer += entry_size;
} }
GST_DEBUG_OBJECT (qtdemux, "found %d segments", count); GST_DEBUG_OBJECT (qtdemux, "found %d segments", n_segments);
stream->n_segments = count; stream->n_segments = n_segments;
if (media_segments_count != 1) if (media_segments_count != 1)
allow_pushbased_edts = FALSE; allow_pushbased_edts = FALSE;
} }