mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-28 09:15:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: remove indent exception and reindent

Browse source 
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.
This commit is contained in:
Mart Raudsepp 2019-05-28 20:14:49 +03:00
parent 4fb749d99f
commit 9b348e755c
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gst/isomp4/qtdemux.c
View file

@ -5148,9 +5148,6 @@ gst_qtdemux_activate_segment (GstQTDemux * qtdemux, QtDemuxStream * stream,
/* find keyframe of the target index */ /* find keyframe of the target index */
kf_index = gst_qtdemux_find_keyframe (qtdemux, stream, index, FALSE); 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 /* 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 * keyframe since we already sent that. We can also just jump to
* the keyframe right before the target index if there is one. */ * 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 */ /* moving forwards check if we move past a keyframe */
if (kf_index > stream->sample_index) { if (kf_index > stream->sample_index) {
GST_DEBUG_OBJECT (stream->pad, GST_DEBUG_OBJECT (stream->pad,
"moving forwards to keyframe at %u (pts %" GST_TIME_FORMAT " dts %"GST_TIME_FORMAT" )", kf_index, "moving forwards to keyframe at %u "
GST_TIME_ARGS (QTSAMPLE_PTS(stream, &stream->samples[kf_index])), "(pts %" GST_TIME_FORMAT " dts %" GST_TIME_FORMAT " )",
GST_TIME_ARGS (QTSAMPLE_DTS(stream, &stream->samples[kf_index]))); 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); gst_qtdemux_move_stream (qtdemux, stream, kf_index);
} else { } else {
GST_DEBUG_OBJECT (stream->pad, 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_PTS (stream, &stream->samples[kf_index])),
GST_TIME_ARGS (QTSAMPLE_DTS (stream, &stream->samples[kf_index]))); GST_TIME_ARGS (QTSAMPLE_DTS (stream, &stream->samples[kf_index])));
} }
} else { } else {
GST_DEBUG_OBJECT (stream->pad, GST_DEBUG_OBJECT (stream->pad,
"moving backwards to keyframe at %u (pts %" GST_TIME_FORMAT " dts %"GST_TIME_FORMAT" )", kf_index, "moving backwards to keyframe at %u "
GST_TIME_ARGS (QTSAMPLE_PTS(stream, &stream->samples[kf_index])), "(pts %" GST_TIME_FORMAT " dts %" GST_TIME_FORMAT " )",
GST_TIME_ARGS (QTSAMPLE_DTS(stream, &stream->samples[kf_index]))); 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); gst_qtdemux_move_stream (qtdemux, stream, kf_index);
} }
/* *INDENT-ON* */
return TRUE; return TRUE;
} }