videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

input: decoder: remove flush workaround on Delete 

Now that flush or drain is done before `vlc_input_decoder_Delete` and
that it has become mandatory, there is no need to flush during delete
preventively.
This commit is contained in:
Alexandre Janniaux 2023-03-16 16:37:47 +01:00 committed by Steve Lhomme
parent c9d874e7ff
commit 69abb5200c
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/input/decoder.c
View File

@ -2216,31 +2216,15 @@ void vlc_input_decoder_Delete( vlc_input_decoder_t *p_owner )
vlc_fifo_Lock( p_owner->p_fifo );
p_owner->aborting = true;
p_owner->flushing = true;
p_owner->b_waiting = false;
vlc_fifo_Signal( p_owner->p_fifo );
/* Make sure we aren't waiting/decoding anymore */
vlc_cond_signal( &p_owner->wait_request );
/* The DecoderThread could be stuck in pf_decode(), waiting for a frame
* to be released to queue the block and return from there. In that case,
* it's not possible to close the decoder before the return of the callback.
* To fix this issue, prevent the decoder to queue picture in the vout by
* setting p_owner->aborting, and flush the vout from here to return the
* pictures to the decoder. This unblocks the DecoderThread, allowing the
* decoder module to later join all its worker threads (if any) and the
* decoder thread to terminate. */
if( p_dec->fmt_in->i_cat == VIDEO_ES && p_owner->p_vout != NULL
&& p_owner->vout_started )
{
vout_FlushAll( p_owner->p_vout );
}
vlc_fifo_Unlock( p_owner->p_fifo );
if( !vlc_input_decoder_IsSynchronous( p_owner ) )
vlc_join( p_owner->thread, NULL );
/* */
if( p_owner->cc.b_supported )
{