From: François Cartegnie <fcvlcdev@free.fr>
Date: Wed, 26 Jun 2024 09:36:01 +0000 (+0700)
Subject: demux: adaptive: fix start with indexes only
X-Git-Tag: archive/raspbian/3.0.21-7+rpi1^2~113
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=1117c1a027ca2fec51a4d68a7e19216563cee142;p=vlc.git

demux: adaptive: fix start with indexes only

refs #28683

(cherry picked from commit 9f9c466bc14c1dcd75564c7cd18d031ea9e76325)

Gbp-Pq: Name 0013-demux-adaptive-fix-start-with-indexes-only.patch
---

diff --git a/modules/demux/adaptive/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
index 1ffae9e8..f40013ab 100644
--- a/modules/demux/adaptive/SegmentTracker.cpp
+++ b/modules/demux/adaptive/SegmentTracker.cpp
@@ -296,7 +296,7 @@ SegmentTracker::prepareChunk(bool switch_allowed, Position pos) const
     bool b_gap = true;
     ISegment *datasegment = pos.rep->getNextMediaSegment(pos.number, &pos.number, &b_gap);
 
-    if(!datasegment)
+    if(!datasegment && (!pos.rep->needsIndex() || pos.index_sent))
         return ChunkEntry();
 
     ISegment *segment = nullptr;
@@ -322,12 +322,12 @@ SegmentTracker::prepareChunk(bool switch_allowed, Position pos) const
     if(!segmentChunk)
         return ChunkEntry();
 
-    if(segment != datasegment) /* need to set for init */
+    if(segment != datasegment && datasegment) /* need to set for init */
         segmentChunk->discontinuitySequenceNumber = datasegment->getDiscontinuitySequenceNumber();
 
     vlc_tick_t startTime = VLC_TICK_INVALID;
     vlc_tick_t duration = 0;
-    vlc_tick_t displayTime = datasegment->getDisplayTime();
+    vlc_tick_t displayTime = datasegment ? datasegment->getDisplayTime() : VLC_TICK_INVALID;
     /* timings belong to timeline and are not set on the segment or need profile timescale */
     if(pos.rep->getPlaybackTimeDurationBySegmentNumber(pos.number, &startTime, &duration))
         startTime += VLC_TICK_0;
diff --git a/modules/demux/adaptive/Streams.cpp b/modules/demux/adaptive/Streams.cpp
index c15d7e14..f2a47190 100644
--- a/modules/demux/adaptive/Streams.cpp
+++ b/modules/demux/adaptive/Streams.cpp
@@ -625,11 +625,14 @@ ChunkInterface * AbstractStream::getNextChunk() const
 {
     const bool b_restarting = fakeEsOut()->restarting();
     ChunkInterface *ck = segmentTracker->getNextChunk(!b_restarting);
+
     if(ck && !fakeEsOut()->hasSegmentStartTimes())
         fakeEsOut()->setSegmentStartTimes(startTimeContext);
 
     if(ck && !fakeEsOut()->hasSynchronizationReference())
     {
+        if(!fakeEsOut()->hasSegmentStartTimes())
+            return ck;
         assert(fakeEsOut()->hasSegmentStartTimes());
         SynchronizationReference r;
         if(segmentTracker->getSynchronizationReference(currentSequence, startTimeContext.media, r))