Skip to content
Snippets Groups Projects
Commit 9f9c466b authored by François Cartegnie's avatar François Cartegnie :fingers_crossed: Committed by Steve Lhomme
Browse files

demux: adaptive: fix start with indexes only

refs #28683
parent 0b3d497a
No related branches found
No related tags found
1 merge request!5645demux: adaptive: fix start with indexes only
Pipeline #486272 passed with stage
in 14 minutes and 21 seconds
......@@ -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;
......
......@@ -622,11 +622,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))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment