Changeset 6d937c8f88c36262433d5060a82f9cd3d5c69786

Timestamp:

24/07/08 19:58:05 (4 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1216922285 +0200

git-parent:

[8e34f1cd2658337329befe2ed73ceaec2f6612e5]

git-author:

Laurent Aimar <fenrir@videolan.org> 1216922285 +0200

Message:

Fixed completely broken video filter 2 chain in vout. Now they have a
chance to get a frame when they ask (close #1738).

Decoders and filters share the same pool of video frames. But the
decoders try to decode as fast as possible, using all buffers. Then it
s pure luck if the filter can grab a frame...

Files:

• include/vlc_vout.h (modified) (1 diff)
• src/input/decoder.c (modified) (2 diffs)
• src/misc/filter_chain.c (modified) (1 diff)
• src/video_output/vout_pictures.c (modified) (1 diff)

include/vlc_vout.h

@@ -661 +661 @@
-VLC_EXPORT( void,            vout_UnlinkPicture,  ( vout_thread_t *, picture_t * ) );
-VLC_EXPORT( void,            vout_PlacePicture,   ( vout_thread_t *, unsigned int, unsigned int, unsigned int *, unsigned int *, unsigned int *, unsigned int * ) );
+
+/* DO NOT use vout_RenderPicture unless you are in src/video_ouput */
-picture_t *     vout_RenderPicture  ( vout_thread_t *, picture_t *,
-                                                       subpicture_t * );
+
+/* DO NOT use vout_CountPictureAvailable unless your are in src/input/dec.c (no exception) */
+int vout_CountPictureAvailable( vout_thread_t * );
-
-VLC_EXPORT( int, vout_vaControlDefault, ( vout_thread_t *, int, va_list ) );

src/input/decoder.c

@@ -1236 +1236 @@
-}
-
+
+int vout_CountPictureAvailable( vout_thread_t *p_vout );
+
-static picture_t *vout_new_buffer( decoder_t *p_dec )
-{
@@ -1318 +1321 @@
-    }
-
-
-
+
+
+
-    {
-        int i_pic, i_ready_pic = 0;
-
-        if( p_dec->b_die || p_dec->b_error )
-        {
-            return NULL;
+
+        /* The video filter chain required that there is always 1 free buffer
+         * that it will use as temporary one. It will release the temporary
+         * buffer once its work is done, so this check is safe even if we don't
+         * lock around both count() and create().
+         */
+        if( vout_CountPictureAvailable( p_sys->p_vout ) >= 2 )
+        {
+            p_pic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 );
+            if( p_pic )
+                break;
-        }
-

src/misc/filter_chain.c

@@ -354 +354 @@
-        {
-            vout_thread_t *p_vout = (vout_thread_t*)p_chain->p_this;
-
-            vlc_mutex_lock( &p_vout->picture_lock );
-            if( p_pic->i_refcount )

src/video_output/vout_pictures.c

@@ -107 +107 @@
- * threads.
- */
+int vout_CountPictureAvailable( vout_thread_t *p_vout )
+{
+    int i_free = 0;
+    int i_pic;
+
+    vlc_mutex_lock( &p_vout->picture_lock );
+    for( i_pic = 0; i_pic < I_RENDERPICTURES; i_pic++ )
+    {
+        picture_t *p_pic = PP_RENDERPICTURE[(p_vout->render.i_last_used_pic + i_pic + 1) % I_RENDERPICTURES];
+
+        switch( p_pic->i_status )
+        {
+            case DESTROYED_PICTURE:
+                i_free++;
+                break;
+
+            case FREE_PICTURE:
+                i_free++;
+                break;
+
+            default:
+                break;
+        }
+    }
+    vlc_mutex_unlock( &p_vout->picture_lock );
+
+    return i_free;
+}
+
-picture_t *vout_CreatePicture( vout_thread_t *p_vout,
-                               bool b_progressive,