Commit 9531a842 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

decoder: inline DecoderSignalWait()

parent 5a234320
...@@ -169,21 +169,6 @@ static bool DecoderIsFlushing( decoder_t *p_dec ) ...@@ -169,21 +169,6 @@ static bool DecoderIsFlushing( decoder_t *p_dec )
return b_flushing; return b_flushing;
} }
static void DecoderSignalWait( decoder_t *p_dec )
{
decoder_owner_sys_t *p_owner = p_dec->p_owner;
vlc_mutex_lock( &p_owner->lock );
if( p_owner->b_waiting )
{
p_owner->b_has_data = true;
vlc_cond_signal( &p_owner->wait_acknowledge );
}
vlc_mutex_unlock( &p_owner->lock );
}
static block_t *DecoderBlockFlushNew() static block_t *DecoderBlockFlushNew()
{ {
block_t *p_null = block_Alloc( 128 ); block_t *p_null = block_Alloc( 128 );
...@@ -450,7 +435,13 @@ static picture_t *vout_new_buffer( decoder_t *p_dec ) ...@@ -450,7 +435,13 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
return p_picture; return p_picture;
/* */ /* */
DecoderSignalWait( p_dec ); vlc_mutex_lock( &p_owner->lock );
if( p_owner->b_waiting )
{
p_owner->b_has_data = true;
vlc_cond_signal( &p_owner->wait_acknowledge );
}
vlc_mutex_unlock( &p_owner->lock );
/* Check the decoder doesn't leak pictures */ /* Check the decoder doesn't leak pictures */
vout_FixLeaks( p_owner->p_vout ); vout_FixLeaks( p_owner->p_vout );
......
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