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
438
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
a6256d3f
Commit
a6256d3f
authored
3 years ago
by
Thomas Guillem
Committed by
François Cartegnie
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
es_out: don't create more than one ES master clock
Regression from
800482fb
Fixes
#25901
parent
3d38357a
No related branches found
Branches containing commit
No related tags found
1 merge request
!379
es_out: don't create more than one ES master clock
Pipeline
#115457
passed with stage
in 26 minutes and 14 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/input/es_out.c
+8
-2
8 additions, 2 deletions
src/input/es_out.c
with
8 additions
and
2 deletions
src/input/es_out.c
+
8
−
2
View file @
a6256d3f
...
...
@@ -75,6 +75,8 @@ typedef struct
/* Clock for this program */
input_clock_t
*
p_input_clock
;
vlc_clock_main_t
*
p_main_clock
;
/* Weak reference to the master ES clock */
const
vlc_clock_t
*
p_master_es_clock
;
enum
vlc_clock_master_source
active_clock_source
;
vlc_tick_t
i_last_pcr
;
...
...
@@ -1460,6 +1462,7 @@ static es_out_pgrm_t *EsOutProgramAdd( es_out_t *out, input_source_t *source, in
p_pgrm
->
b_scrambled
=
false
;
p_pgrm
->
i_last_pcr
=
VLC_TICK_INVALID
;
p_pgrm
->
p_meta
=
NULL
;
p_pgrm
->
p_master_es_clock
=
NULL
;
p_pgrm
->
active_clock_source
=
VLC_CLOCK_MASTER_AUTO
;
p_pgrm
->
p_main_clock
=
vlc_clock_main_New
(
p_input
->
obj
.
logger
);
...
...
@@ -2268,10 +2271,11 @@ static void EsOutCreateDecoder( es_out_t *out, es_out_id_t *p_es )
}
if
(
p_es
->
fmt
.
i_cat
!=
UNKNOWN_ES
&&
p_es
->
fmt
.
i_cat
==
clock_source_cat
)
&&
p_es
->
fmt
.
i_cat
==
clock_source_cat
&&
p_es
->
p_pgrm
->
p_master_es_clock
==
NULL
)
{
p_es
->
master
=
true
;
p_es
->
p_clock
=
p_es
->
p_pgrm
->
p_master_es_clock
=
p_es
->
p_clock
=
vlc_clock_main_CreateMaster
(
p_es
->
p_pgrm
->
p_main_clock
,
&
clock_cbs
,
p_es
);
}
...
...
@@ -2334,6 +2338,8 @@ static void EsOutDestroyDecoder( es_out_t *out, es_out_id_t *p_es )
vlc_input_decoder_Delete
(
p_es
->
p_dec
);
p_es
->
p_dec
=
NULL
;
if
(
p_es
->
p_pgrm
->
p_master_es_clock
==
p_es
->
p_clock
)
p_es
->
p_pgrm
->
p_master_es_clock
=
NULL
;
vlc_clock_Delete
(
p_es
->
p_clock
);
p_es
->
p_clock
=
NULL
;
...
...
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