Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
439
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
9f9c466b
Commit
9f9c466b
authored
7 months ago
by
François Cartegnie
Committed by
Steve Lhomme
7 months ago
Browse files
Options
Downloads
Patches
Plain Diff
demux: adaptive: fix start with indexes only
refs
#28683
parent
0b3d497a
No related branches found
Branches containing commit
No related tags found
1 merge request
!5645
demux: adaptive: fix start with indexes only
Pipeline
#486272
passed with stage
in 14 minutes and 21 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/demux/adaptive/SegmentTracker.cpp
+3
-3
3 additions, 3 deletions
modules/demux/adaptive/SegmentTracker.cpp
modules/demux/adaptive/Streams.cpp
+3
-0
3 additions, 0 deletions
modules/demux/adaptive/Streams.cpp
with
6 additions
and
3 deletions
modules/demux/adaptive/SegmentTracker.cpp
+
3
−
3
View file @
9f9c466b
...
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
modules/demux/adaptive/Streams.cpp
+
3
−
0
View file @
9f9c466b
...
...
@@ -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
))
...
...
This diff is collapsed.
Click to expand it.
François Cartegnie
@fcartegnie
mentioned in merge request
!5686 (merged)
·
7 months ago
mentioned in merge request
!5686 (merged)
mentioned in merge request !5686
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment