Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
53a832b2
Commit
53a832b2
authored
Dec 11, 2015
by
Petri Hintukainen
Committed by
Jean-Baptiste Kempf
Dec 11, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bluray: simplify vout change detection
Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
0b0688d5
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
12 deletions
+8
-12
modules/access/bluray.c
modules/access/bluray.c
+8
-12
No files found.
modules/access/bluray.c
View file @
53a832b2
...
...
@@ -2085,18 +2085,6 @@ static void blurayHandleOverlays(demux_t *p_demux, int nread)
if
(
display
)
{
if
(
p_sys
->
p_vout
==
NULL
)
p_sys
->
p_vout
=
input_GetVout
(
p_demux
->
p_input
);
else
{
/* track vout changes */
vout_thread_t
*
p_vout
=
input_GetVout
(
p_demux
->
p_input
);
if
(
p_vout
!=
p_sys
->
p_vout
)
{
msg_Info
(
p_demux
,
"vout changed %p -> %p
\n
"
,
(
void
*
)
p_sys
->
p_vout
,
(
void
*
)
p_vout
);
blurayReleaseVout
(
p_demux
);
p_sys
->
p_vout
=
p_vout
;
}
else
{
vlc_object_release
(
p_vout
);
}
}
/* NOTE: we might want to enable background video always when there's no video stream playing.
Now, with some discs, there are perioids (even seconds) during which the video window
...
...
@@ -2128,8 +2116,16 @@ static int onIntfEvent( vlc_object_t *p_input, char const *psz_var,
{
(
void
)
p_input
;
(
void
)
psz_var
;
(
void
)
oldval
;
demux_t
*
p_demux
=
p_data
;
demux_sys_t
*
p_sys
=
p_demux
->
p_sys
;
if
(
val
.
i_int
==
INPUT_EVENT_VOUT
)
{
vlc_mutex_lock
(
&
p_sys
->
bdj_overlay_lock
);
if
(
p_sys
->
p_vout
!=
NULL
)
{
blurayReleaseVout
(
p_demux
);
}
vlc_mutex_unlock
(
&
p_sys
->
bdj_overlay_lock
);
blurayHandleOverlays
(
p_demux
,
1
);
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment