Commit 982f3e42 authored by Laurent Aimar's avatar Laurent Aimar

Fixed a deadlock between ressources freeing and playlist through gui.

parent f379cff8
...@@ -484,13 +484,17 @@ static int LoopInput( playlist_t *p_playlist ) ...@@ -484,13 +484,17 @@ static int LoopInput( playlist_t *p_playlist )
assert( p_sys->p_input_ressource == NULL ); assert( p_sys->p_input_ressource == NULL );
p_sys->p_input_ressource = input_DetachRessource( p_input ); 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" ) ) if( !var_CreateGetBool( p_input, "sout-keep" ) )
input_ressource_TerminateSout( p_sys->p_input_ressource ); input_ressource_TerminateSout( p_sys->p_input_ressource );
/* The DelCallback must be issued without playlist lock /* The DelCallback must be issued without playlist lock */
* It is not a problem as we return VLC_EGENERIC */
PL_UNLOCK;
var_DelCallback( p_input, "intf-event", InputEvent, p_playlist ); var_DelCallback( p_input, "intf-event", InputEvent, p_playlist );
PL_LOCK; PL_LOCK;
p_sys->p_input = NULL; p_sys->p_input = NULL;
...@@ -533,12 +537,24 @@ static void LoopRequest( playlist_t *p_playlist ) ...@@ -533,12 +537,24 @@ static void LoopRequest( playlist_t *p_playlist )
{ {
p_sys->status.i_status = PLAYLIST_STOPPED; 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 ); input_ressource_TerminateVout( p_sys->p_input_ressource );
PL_LOCK;
}
else
{
if( vlc_object_alive( p_playlist ) ) if( vlc_object_alive( p_playlist ) )
vlc_cond_wait( &pl_priv(p_playlist)->signal, vlc_cond_wait( &pl_priv(p_playlist)->signal,
&vlc_internals(p_playlist)->lock ); &vlc_internals(p_playlist)->lock );
}
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment