Skip to content

V
vlc-2-2
Commit 269766b0 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

decoder: do not emit output events if there is no input

parent 856c0064
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 5 deletions
src/input/decoder.c
View file @ 269766b0
...@@ -2088,7 +2088,8 @@ static void DeleteDecoder( decoder_t * p_dec ) ...@@ -2088,7 +2088,8 @@ static void DeleteDecoder( decoder_t * p_dec )
if( p_owner->p_aout ) if( p_owner->p_aout )
{ {
input_resource_RequestAout( p_owner->p_resource, p_owner->p_aout ); input_resource_RequestAout( p_owner->p_resource, p_owner->p_aout );
input_SendEventAout( p_owner->p_input ); if( p_owner->p_input != NULL )
input_SendEventAout( p_owner->p_input );
p_owner->p_aout = NULL; p_owner->p_aout = NULL;
} }
if( p_owner->p_vout ) if( p_owner->p_vout )
...@@ -2100,7 +2101,8 @@ static void DeleteDecoder( decoder_t * p_dec ) ...@@ -2100,7 +2101,8 @@ static void DeleteDecoder( decoder_t * p_dec )
/* */ /* */
input_resource_RequestVout( p_owner->p_resource, p_owner->p_vout, NULL, input_resource_RequestVout( p_owner->p_resource, p_owner->p_vout, NULL,
0, true ); 0, true );
input_SendEventVout( p_owner->p_input ); if( p_owner->p_input != NULL )
input_SendEventVout( p_owner->p_input );
} }
#ifdef ENABLE_SOUT #ifdef ENABLE_SOUT
...@@ -2182,7 +2184,8 @@ static vout_thread_t *aout_request_vout( void *p_private, ...@@ -2182,7 +2184,8 @@ static vout_thread_t *aout_request_vout( void *p_private,
p_vout = input_resource_RequestVout( p_owner->p_resource, p_vout, p_fmt, 1, p_vout = input_resource_RequestVout( p_owner->p_resource, p_vout, p_fmt, 1,
b_recyle ); b_recyle );
input_SendEventVout( p_input ); if( p_input != NULL )
input_SendEventVout( p_input );
return p_vout; return p_vout;
} }
...@@ -2257,7 +2260,8 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples ) ...@@ -2257,7 +2260,8 @@ static aout_buffer_t *aout_new_buffer( decoder_t *p_dec, int i_samples )
vlc_mutex_unlock( &p_owner->lock ); vlc_mutex_unlock( &p_owner->lock );
input_SendEventAout( p_owner->p_input ); if( p_owner->p_input != NULL )
input_SendEventAout( p_owner->p_input );
if( p_owner->p_aout_input == NULL ) if( p_owner->p_aout_input == NULL )
{ {
...@@ -2382,7 +2386,8 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) ...@@ -2382,7 +2386,8 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
vlc_mutex_unlock( &p_owner->lock ); vlc_mutex_unlock( &p_owner->lock );
input_SendEventVout( p_owner->p_input ); if( p_owner->p_input != NULL )
input_SendEventVout( p_owner->p_input );
if( p_vout == NULL ) if( p_vout == NULL )
{ {
msg_Err( p_dec, "failed to create video output" ); msg_Err( p_dec, "failed to create video output" );
......
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