[vlc-devel] commit: Allow to stop decoder even in infinite decoder loop ( in case of broken decoder). (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Wed Jul  2 21:00:24 2008 +0000| [aec5639a63df6867032b76e71fe2add85919f992]

Allow to stop decoder even in infinite decoder loop (in case of broken decoder).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aec5639a63df6867032b76e71fe2add85919f992
---

 src/input/decoder.c |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index b0ccbe8..a00b4c8 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -625,6 +625,13 @@ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
 
     while( (p_aout_buf = p_dec->pf_decode_audio( p_dec, &p_block )) )
     {
+        if( p_dec->b_die )
+        {
+            /* It prevent freezing VLC in case of broken decoder */
+            if( p_block )
+                block_Release( p_block );
+            break;
+        }
         vlc_mutex_lock( &p_input->p->counters.counters_lock );
         stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_audio, 1, NULL );
         vlc_mutex_unlock( &p_input->p->counters.counters_lock );
@@ -829,6 +836,14 @@ static void DecoderDecodeVideo( decoder_t *p_dec, block_t *p_block )
 
     while( (p_pic = p_dec->pf_decode_video( p_dec, &p_block )) )
     {
+        if( p_dec->b_die )
+        {
+            /* It prevent freezing VLC in case of broken decoder */
+            if( p_block )
+                block_Release( p_block );
+            break;
+        }
+
         vlc_mutex_lock( &p_input->p->counters.counters_lock );
         stats_UpdateInteger( p_dec, p_input->p->counters.p_decoded_video, 1, NULL );
         vlc_mutex_unlock( &p_input->p->counters.counters_lock );