Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
cc-spu-fix
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Leandro Consiglio
cc-spu-fix
Commits
566df1a6
Commit
566df1a6
authored
6 years ago
by
Steve Lhomme
Browse files
Options
Downloads
Patches
Plain Diff
demux:mkv: fix the PCR for ordered chapters
Fixes
#19101
parent
1737a0a1
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/demux/mkv/matroska_segment.cpp
+1
-1
1 addition, 1 deletion
modules/demux/mkv/matroska_segment.cpp
modules/demux/mkv/virtual_segment.cpp
+4
-2
4 additions, 2 deletions
modules/demux/mkv/virtual_segment.cpp
with
5 additions
and
3 deletions
modules/demux/mkv/matroska_segment.cpp
+
1
−
1
View file @
566df1a6
...
...
@@ -848,7 +848,7 @@ bool matroska_segment_c::Seek( demux_t &demuxer, mtime_t i_absolute_mk_date, mti
trackit
->
second
->
i_skip_until_fpos
=
it
->
second
.
fpos
;
else
trackit
->
second
->
i_skip_until_fpos
=
std
::
numeric_limits
<
uint64_t
>::
max
();
trackit
->
second
->
i_last_dts
=
it
->
second
.
pts
;
trackit
->
second
->
i_last_dts
=
it
->
second
.
pts
+
i_mk_time_offset
;
msg_Dbg
(
&
sys
.
demuxer
,
"seek: preroll{ track: %u, pts: %"
PRId64
", fpos: %"
PRIu64
" skip: %"
PRIu64
"} "
,
it
->
first
,
it
->
second
.
pts
,
it
->
second
.
fpos
,
trackit
->
second
->
i_skip_until_fpos
);
...
...
This diff is collapsed.
Click to expand it.
modules/demux/mkv/virtual_segment.cpp
+
4
−
2
View file @
566df1a6
...
...
@@ -112,7 +112,7 @@ virtual_edition_c::virtual_edition_c( chapter_edition_c * p_edit, matroska_segme
p_edition
=
p_edit
;
b_ordered
=
false
;
int64_t
usertime_offset
=
0
;
int64_t
usertime_offset
=
0
;
// microseconds
/* ordered chapters */
if
(
p_edition
&&
p_edition
->
b_ordered
)
...
...
@@ -461,6 +461,7 @@ bool virtual_segment_c::UpdateCurrentToChapter( demux_t & demux )
return
true
;
}
sys
.
i_start_pts
=
p_cur_vchapter
->
i_mk_virtual_start_time
+
VLC_TS_0
;
sys
.
i_mk_chapter_time
=
p_cur_vchapter
->
i_mk_virtual_start_time
-
p_cur_vchapter
->
segment
.
i_mk_start_time
-
(
(
p_cur_vchapter
->
p_chapter
)
?
p_cur_vchapter
->
p_chapter
->
i_start_time
:
0
)
/* + VLC_TS_0 */
;
}
}
...
...
@@ -521,7 +522,8 @@ bool virtual_segment_c::Seek( demux_t & demuxer, mtime_t i_mk_date,
if
(
p_vchapter
!=
NULL
)
{
mtime_t
i_mk_time_offset
=
p_vchapter
->
i_mk_virtual_start_time
-
(
(
p_vchapter
->
p_chapter
)
?
p_vchapter
->
p_chapter
->
i_start_time
:
0
);
p_sys
->
i_mk_chapter_time
=
i_mk_time_offset
-
p_vchapter
->
segment
.
i_mk_start_time
/* + VLC_TS_0 */
;
if
(
CurrentEdition
()
->
b_ordered
)
p_sys
->
i_mk_chapter_time
=
p_vchapter
->
i_mk_virtual_start_time
-
p_vchapter
->
segment
.
i_mk_start_time
-
(
(
p_vchapter
->
p_chapter
)
?
p_vchapter
->
p_chapter
->
i_start_time
:
0
)
/* + VLC_TS_0 */
;
if
(
p_vchapter
->
p_chapter
&&
p_vchapter
->
i_seekpoint_num
>
0
)
{
p_sys
->
i_updates
|=
INPUT_UPDATE_TITLE
|
INPUT_UPDATE_SEEKPOINT
;
...
...
This diff is collapsed.
Click to expand it.
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