[vlc-commits] decoder: simplify based on vout_GetPicture() change

Rémi Denis-Courmont git at videolan.org
Sun Sep 27 22:05:14 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 27 19:50:24 2015 +0300| [ee9f587bc08de89b38ea4f224d836654adf01609] | committer: Rémi Denis-Courmont

decoder: simplify based on vout_GetPicture() change

Also fixes lot of spurious decoder errors when stopping due to
excessive flush checks.

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

 src/input/decoder.c |   13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index cdedd9d..4d9809e 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -480,18 +480,7 @@ static picture_t *vout_new_buffer( decoder_t *p_dec )
 {
     decoder_owner_sys_t *p_owner = p_dec->p_owner;
 
-    for( ;; )
-    {
-        if( DecoderIsFlushing( p_dec ) || p_dec->b_error )
-            return NULL;
-
-        picture_t *p_picture = vout_GetPicture( p_owner->p_vout );
-        if( p_picture )
-            return p_picture;
-
-        /* FIXME add a vout_WaitPictureAvailable (timedwait) */
-        msleep( VOUT_OUTMEM_SLEEP );
-    }
+    return vout_GetPicture( p_owner->p_vout );
 }
 
 static subpicture_t *spu_new_buffer( decoder_t *p_dec,



More information about the vlc-commits mailing list