diff options
| author | Mathieu Duponchelle <mathieu@centricular.com> | 2023-05-05 19:41:34 +0200 |
|---|---|---|
| committer | GStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org> | 2023-06-11 23:02:02 +0000 |
| commit | 831cff876d041d32199e4f9791798c40c15b4514 (patch) | |
| tree | 7f172c347348bb0cf4e2b6ffc7101659bd8b2fea | |
| parent | 6df59ec79f474c8075f8feec56b2f05cabd37f2f (diff) | |
Revert "qtdemux: fix conditions for end of segment in reverse playback"
This reverts commit 9deb3c27acd4161f810cd782f03bcdaccf2643c7.
The test case that was described in the associated MR
(https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/262)
remains adequately fixed by a related MR that was merged later
(https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/275).
It introduced incorrect logic that broke edit lists as described in
https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2549
Fixes: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/2549
Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4833>
| -rw-r--r-- | subprojects/gst-plugins-good/gst/isomp4/qtdemux.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c index 92a17f686b..382b9e8e5f 100644 --- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c +++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c @@ -6357,16 +6357,8 @@ gst_qtdemux_loop_state_movie (GstQTDemux * qtdemux) stream = QTDEMUX_NTH_STREAM (qtdemux, i); position = stream->time_position; - if (!GST_CLOCK_TIME_IS_VALID (position)) - continue; - - if (stream->segment_index != -1) { - QtDemuxSegment *segment = &stream->segments[stream->segment_index]; - position += segment->media_start; - } - /* position of -1 is EOS */ - if (position < min_time) { + if (position != GST_CLOCK_TIME_NONE && position < min_time) { min_time = position; target_stream = stream; } |