Changeset 1b431f4bcfc2199984d68b8b100dcaa73524098c

Timestamp:

10/01/08 22:20:16 (9 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1200000016 +0000

git-parent:

[793a81a922a7cb8443b803f98b30ca494ff2a304]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1200000016 +0000

Message:

Change the chain module so it allows chaining more than 2 chroma modules (you'll have to change the define at the start of the source code, and there's no guarantee that it'll use the shortest path between the source and dest chromas).

Files:

• modules/video_chroma/chain.c (modified) (4 diffs)

modules/video_chroma/chain.c

@@ -70 +70 @@
-static int Activate( vlc_object_t *p_this )
-{
-0
+1
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-
-
+
+
-    {
-
+
+
+
-        return VLC_EGENERIC;
-    }
-
-    hack = 1;
-
-    chroma_sys_t *p_sys = (chroma_sys_t *)malloc( sizeof( chroma_sys_t ) );
-    if( !p_sys )
-    {
- = 0
+--
-        return VLC_ENOMEM;
-    }
@@ -124 +125 @@
-        p_vout->chroma.pf_convert = Chain;
-        p_vout->chroma.p_sys = p_sys;
-
+
+
-        return VLC_SUCCESS;
-    }
-
-    free( p_sys );
- = 0
+--
-    return VLC_EGENERIC;
-}
@@ -151 +153 @@
-    }
-    free( chroma.p_sys );
+    chroma.p_sys = NULL;
-}
-
@@ -177 +180 @@
-    }
-
+    vout_chroma_t chroma = p_vout->chroma;
+    p_vout->chroma = p_sys->chroma1;
-    p_sys->chroma1.pf_convert( p_vout, p_source, p_sys->p_tmp );
+    p_vout->chroma = p_sys->chroma2;
-    p_sys->chroma2.pf_convert( p_vout, p_sys->p_tmp, p_dest );
+    p_vout->chroma = chroma;
-}