Changeset aec5639a63df6867032b76e71fe2add85919f992

Timestamp:

07/02/08 23:00:41 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1215032441 +0000

git-parent:

[d34e1a85ea38816ca5083082be88b803e5bf580d]

git-author:

Laurent Aimar <fenrir@videolan.org> 1215032424 +0000

Message:

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

Files:

• src/input/decoder.c (modified) (2 diffs)

src/input/decoder.c

@@ -626 +626 @@
-    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 );
@@ -830 +837 @@
-    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 );