summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu@centricular.com>2023-05-05 19:41:34 +0200
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>2023-05-11 16:45:37 +0000
commit3d3d2ed447cb98e2eb61bda650d363d5adf03677 (patch)
treef38b561b475ba4398de73d2259c78a510347755a
parent560d20a2c08dc77a4a6694d66aa8aaae637a7ec3 (diff)
downloadgstreamer-3d3d2ed447cb98e2eb61bda650d363d5adf03677.tar.gz
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/4560>
-rw-r--r--subprojects/gst-plugins-good/gst/isomp4/qtdemux.c10
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 361d6e2535..2b055e8c2a 100644
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
@@ -6982,16 +6982,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;
}