From 9b348e755ca1aebbe772809ae058e9a9042ce123 Mon Sep 17 00:00:00 2001 From: Mart Raudsepp Date: Tue, 28 May 2019 20:14:49 +0300 Subject: [PATCH] qtdemux: remove indent exception and reindent As the indent disabling isn't playing along for a following fix, remove the indent disabling and reindent in a way that doesn't look too stupid. --- gst/isomp4/qtdemux.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index c12074ba04..6499015619 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -5148,9 +5148,6 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream, /* find keyframe of the target index */ kf_index = gst_qtdemux_find_keyframe (qtdemux, stream, index, FALSE); -/* *INDENT-OFF* */ -/* indent does stupid stuff with stream->samples[].timestamp */ - /* if we move forwards, we don't have to go back to the previous * keyframe since we already sent that. We can also just jump to * the keyframe right before the target index if there is one. */ @@ -5158,26 +5155,30 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream, /* moving forwards check if we move past a keyframe */ if (kf_index > stream->sample_index) { GST_DEBUG_OBJECT (stream->pad, - "moving forwards to keyframe at %u (pts %" GST_TIME_FORMAT " dts %"GST_TIME_FORMAT" )", kf_index, - GST_TIME_ARGS (QTSAMPLE_PTS(stream, &stream->samples[kf_index])), - GST_TIME_ARGS (QTSAMPLE_DTS(stream, &stream->samples[kf_index]))); + "moving forwards to keyframe at %u " + "(pts %" GST_TIME_FORMAT " dts %" GST_TIME_FORMAT " )", + kf_index, + GST_TIME_ARGS (QTSAMPLE_PTS (stream, &stream->samples[kf_index])), + GST_TIME_ARGS (QTSAMPLE_DTS (stream, &stream->samples[kf_index]))); gst_qtdemux_move_stream (qtdemux, stream, kf_index); } else { GST_DEBUG_OBJECT (stream->pad, - "moving forwards, keyframe at %u (pts %" GST_TIME_FORMAT " dts %"GST_TIME_FORMAT" ) already sent", kf_index, + "moving forwards, keyframe at %u " + "(pts %" GST_TIME_FORMAT " dts %" GST_TIME_FORMAT " ) already sent", + kf_index, GST_TIME_ARGS (QTSAMPLE_PTS (stream, &stream->samples[kf_index])), GST_TIME_ARGS (QTSAMPLE_DTS (stream, &stream->samples[kf_index]))); } } else { GST_DEBUG_OBJECT (stream->pad, - "moving backwards to keyframe at %u (pts %" GST_TIME_FORMAT " dts %"GST_TIME_FORMAT" )", kf_index, - GST_TIME_ARGS (QTSAMPLE_PTS(stream, &stream->samples[kf_index])), - GST_TIME_ARGS (QTSAMPLE_DTS(stream, &stream->samples[kf_index]))); + "moving backwards to keyframe at %u " + "(pts %" GST_TIME_FORMAT " dts %" GST_TIME_FORMAT " )", + kf_index, + GST_TIME_ARGS (QTSAMPLE_PTS (stream, &stream->samples[kf_index])), + GST_TIME_ARGS (QTSAMPLE_DTS (stream, &stream->samples[kf_index]))); gst_qtdemux_move_stream (qtdemux, stream, kf_index); } -/* *INDENT-ON* */ - return TRUE; }