summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu@centricular.com>2023-05-05 19:41:34 +0200
committerTim-Philipp Müller <tim@centricular.com>2023-05-11 18:44:15 +0100
commit8bb2d236665705487f96c0f7bdc05c48fc01525c (patch)
tree5381b7facf963c7263e49a4f7180ed724ef24d6a
parent850c57bad75850907e7eb57b0df8e5f917b1275b (diff)
downloadgstreamer-8bb2d236665705487f96c0f7bdc05c48fc01525c.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/4605>
-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 0e5904dd0b..10bb9e64b1 100644
--- a/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
+++ b/subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
@@ -6547,16 +6547,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;
}