Changeset 71c1ddb6aa1c9715d1096b3bbee3e7f0abcc7f07

Timestamp:

06/29/08 22:59:01 (2 months ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[bfd381dc4270c0fc139752d4115c5d42ee82438b]

git-author:

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

Message:

Added ChromaCreate/Destroy? (cosmetic)

Files:

• src/video_output/video_output.c (modified) (5 diffs)

src/video_output/video_output.c

@@ -58 +58 @@
-
-#include "modules/modules.h"
+#include <assert.h>
-
-/*****************************************************************************
@@ -509 +510 @@
- * XXX You have to enter it with change_lock taken.
- *****************************************************************************/
-
-
-
-
-
-
+
+
-
-static int InitThread( vout_thread_t *p_vout )
@@ -649 +646 @@
-        p_vout->b_direct = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-            p_vout->pf_end( p_vout );
-            return VLC_EGENERIC;
-        }
-        p_chroma->pf_vout_buffer_new = get_pic;
-
-        msg_Dbg( p_vout, "indirect render, mapping "
@@ -1226 +1196 @@
-
-    if( !p_vout->b_direct )
-
-
-
-
-
+
-
-    /* Destroy all remaining pictures */
@@ -1251 +1217 @@
-    p_vout->pf_end( p_vout );
-}
+
+/* Thread helpers */
+static picture_t *ChromaGetPicture( filter_t *p_filter )
+{
+    picture_t *p_pic = (picture_t *)p_filter->p_owner;
+    p_filter->p_owner = NULL;
+    return p_pic;
+}
+
+static int ChromaCreate( vout_thread_t *p_vout )
+{
+    filter_t *p_chroma;
+
+    /* Choose the best module */
+    p_chroma = p_vout->p_chroma = vlc_object_create( p_vout, sizeof(filter_t) );
+
+    vlc_object_attach( p_chroma, p_vout );
+
+    /* TODO: Set the fmt_in and fmt_out stuff here */
+    p_chroma->fmt_in.video = p_vout->fmt_render;
+    p_chroma->fmt_out.video = p_vout->fmt_out;
+
+    p_chroma->fmt_out.video.i_rmask = p_vout->output.i_rmask;
+    p_chroma->fmt_out.video.i_gmask = p_vout->output.i_gmask;
+    p_chroma->fmt_out.video.i_bmask = p_vout->output.i_bmask;
+    p_chroma->fmt_out.video.i_rrshift = p_vout->output.i_rrshift;
+    p_chroma->fmt_out.video.i_lrshift = p_vout->output.i_lrshift;
+    p_chroma->fmt_out.video.i_rgshift = p_vout->output.i_rgshift;
+    p_chroma->fmt_out.video.i_lgshift = p_vout->output.i_lgshift;
+    p_chroma->fmt_out.video.i_rbshift = p_vout->output.i_rbshift;
+    p_chroma->fmt_out.video.i_lbshift = p_vout->output.i_lbshift;
+    p_chroma->p_module = module_Need( p_chroma, "video filter2", NULL, 0 );
+
+    if( p_chroma->p_module == NULL )
+    {
+        msg_Err( p_vout, "no chroma module for %4.4s to %4.4s",
+                 (char*)&p_vout->render.i_chroma,
+                 (char*)&p_vout->output.i_chroma );
+
+        vlc_object_release( p_vout->p_chroma );
+        p_vout->p_chroma = NULL;
+        return VLC_EGENERIC;
+    }
+    p_chroma->pf_vout_buffer_new = ChromaGetPicture;
+    return VLC_SUCCESS;
+}
+static void ChromaDestroy( vout_thread_t *p_vout )
+{
+    assert( !p_vout->b_direct && p_vout->p_chroma );
+
+    module_Unneed( p_vout->p_chroma, p_vout->p_chroma->p_module );
+    vlc_object_release( p_vout->p_chroma );
+    p_vout->p_chroma = NULL;
+}
+
+
-
-/* following functions are local */