Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
982f3e42
Commit
982f3e42
authored
Jan 24, 2009
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a deadlock between ressources freeing and playlist through gui.
parent
f379cff8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
7 deletions
+23
-7
src/playlist/thread.c
src/playlist/thread.c
+23
-7
No files found.
src/playlist/thread.c
View file @
982f3e42
...
...
@@ -484,13 +484,17 @@ static int LoopInput( playlist_t *p_playlist )
assert
(
p_sys
->
p_input_ressource
==
NULL
);
p_sys
->
p_input_ressource
=
input_DetachRessource
(
p_input
);
PL_UNLOCK
;
/* We can unlock as we return VLC_EGENERIC (no event will be lost) */
/* input_ressource_t must be manipulated without playlist lock */
if
(
!
var_CreateGetBool
(
p_input
,
"sout-keep"
)
)
input_ressource_TerminateSout
(
p_sys
->
p_input_ressource
);
/* The DelCallback must be issued without playlist lock
* It is not a problem as we return VLC_EGENERIC */
PL_UNLOCK
;
/* The DelCallback must be issued without playlist lock */
var_DelCallback
(
p_input
,
"intf-event"
,
InputEvent
,
p_playlist
);
PL_LOCK
;
p_sys
->
p_input
=
NULL
;
...
...
@@ -533,12 +537,24 @@ static void LoopRequest( playlist_t *p_playlist )
{
p_sys
->
status
.
i_status
=
PLAYLIST_STOPPED
;
if
(
p_sys
->
p_input_ressource
)
if
(
p_sys
->
p_input_ressource
&&
input_ressource_HasVout
(
p_sys
->
p_input_ressource
)
)
{
/* XXX We can unlock if we don't issue the wait as we will be
* call again without anything else done between the calls */
PL_UNLOCK
;
/* input_ressource_t must be manipulated without playlist lock */
input_ressource_TerminateVout
(
p_sys
->
p_input_ressource
);
if
(
vlc_object_alive
(
p_playlist
)
)
vlc_cond_wait
(
&
pl_priv
(
p_playlist
)
->
signal
,
&
vlc_internals
(
p_playlist
)
->
lock
);
PL_LOCK
;
}
else
{
if
(
vlc_object_alive
(
p_playlist
)
)
vlc_cond_wait
(
&
pl_priv
(
p_playlist
)
->
signal
,
&
vlc_internals
(
p_playlist
)
->
lock
);
}
return
;
}
...
...
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