1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From: =?utf-8?q?Fran=C3=A7ois_Cartegnie?= <fcvlcdev@free.fr>
Date: Wed, 26 Jun 2024 16:36:01 +0700
Subject: demux: adaptive: fix start with indexes only
refs #28683
(cherry picked from commit 9f9c466bc14c1dcd75564c7cd18d031ea9e76325)
---
modules/demux/adaptive/SegmentTracker.cpp | 6 +++---
modules/demux/adaptive/Streams.cpp | 3 +++
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/modules/demux/adaptive/SegmentTracker.cpp b/modules/demux/adaptive/SegmentTracker.cpp
index 1ffae9e..f40013a 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 c15d7e1..f2a4719 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))
|
