From c69ccf60d8e378f144060607c93c5e5b0731ecb3 Mon Sep 17 00:00:00 2001 From: Seungha Yang Date: Sat, 31 Mar 2018 18:42:47 +0900 Subject: [PATCH] qtdemux: Clarify variable name As defined by spec, use "empty edit". It's more straightforward. https://bugzilla.gnome.org/show_bug.cgi?id=778426 --- gst/isomp4/qtdemux.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index 1b323e83d9..76bab967e8 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -9452,7 +9452,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream, for (segment_number = 0; segment_number < n_segments; segment_number++) { guint64 duration; guint64 media_time; - gboolean time_valid = TRUE; + gboolean empty_edit = FALSE; QtDemuxSegment *segment; guint32 rate_int; GstClockTime media_start = GST_CLOCK_TIME_NONE; @@ -9461,15 +9461,15 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream, media_time = QT_UINT64 (buffer + 8); duration = QT_UINT64 (buffer); if (media_time == G_MAXUINT64) - time_valid = FALSE; + empty_edit = TRUE; } else { media_time = QT_UINT32 (buffer + 4); duration = QT_UINT32 (buffer); if (media_time == G_MAXUINT32) - time_valid = FALSE; + empty_edit = TRUE; } - if (time_valid) + if (!empty_edit) media_start = QTSTREAMTIME_TO_GSTTIME (stream, media_time); segment = &stream->segments[segment_number]; @@ -9485,7 +9485,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream, /* zero duration does not imply media_start == media_stop * but, only specify media_start.*/ stime = QTTIME_TO_GSTTIME (qtdemux, qtdemux->duration); - if (GST_CLOCK_TIME_IS_VALID (stime) && time_valid + if (GST_CLOCK_TIME_IS_VALID (stime) && !empty_edit && stime >= media_start) { segment->duration = stime - media_start; } else { @@ -9496,7 +9496,7 @@ qtdemux_parse_segments (GstQTDemux * qtdemux, QtDemuxStream * stream, segment->trak_media_start = media_time; /* media_time expressed in stream timescale */ - if (time_valid) { + if (!empty_edit) { segment->media_start = media_start; segment->media_stop = segment->media_start + segment->duration; media_segments_count++;