Commit baae4f74 authored by Laurent Aimar's avatar Laurent Aimar

Fast decoder thread cancellation.

parent c12edba9
...@@ -862,6 +862,7 @@ static void *DecoderThread( vlc_object_t *p_this ) ...@@ -862,6 +862,7 @@ static void *DecoderThread( vlc_object_t *p_this )
for( ;; ) for( ;; )
{ {
block_t *p_block = block_FifoGet( p_owner->p_fifo ); block_t *p_block = block_FifoGet( p_owner->p_fifo );
/* Make sure there is no cancellation point other than this one^^. /* Make sure there is no cancellation point other than this one^^.
* If you need one, be sure to push cleanup of p_block. */ * If you need one, be sure to push cleanup of p_block. */
DecoderSignalBuffering( p_dec, p_block == NULL ); DecoderSignalBuffering( p_dec, p_block == NULL );
...@@ -877,9 +878,9 @@ static void *DecoderThread( vlc_object_t *p_this ) ...@@ -877,9 +878,9 @@ static void *DecoderThread( vlc_object_t *p_this )
vlc_restorecancel( canc ); vlc_restorecancel( canc );
} }
/* Ensure fast cancellation in case the fifo is not empty */
vlc_testcancel();
} }
DecoderSignalBuffering( p_dec, true );
return NULL; return NULL;
} }
......
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