Changeset e445caad6168b072f9d3f525f3fef3af639f67e5

Timestamp:

04/22/08 23:36:45 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1208900205 +0200

git-parent:

[722ab9f14ee31f8f0633cfc7a0b79401c47316fe]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1208895622 +0200

Message:

Add picture specific alpha setting for mosaic pictures.
Add coordinates settings for mosaic pictures. (This kind of duplicates the --mosaic-offsets setting which I'm thinking about removing.)

Files:

• modules/stream_out/mosaic_bridge.c (modified) (7 diffs)
• modules/video_filter/mosaic.c (modified) (3 diffs)
• modules/video_filter/mosaic.h (modified) (1 diff)

modules/stream_out/mosaic_bridge.c

@@ -116 +116 @@
-static void video_link_picture_decoder( decoder_t *, picture_t * );
-static void video_unlink_picture_decoder( decoder_t *, picture_t * );
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-/*****************************************************************************
@@ -144 +153 @@
-    "Force the use of a specific chroma. Use YUVA if you're planning " \
-    "to use the Alphamask or Bluescreen video filter." )
+
+#define ALPHA_TEXT N_("Transparency")
+#define ALPHA_LONGTEXT N_( \
+    "Transparency of the mosaic picture." )
+
+#define X_TEXT N_("X offset")
+#define X_LONGTEXT N_( \
+    "X coordinate of the upper left corner in the mosaic if non negative." )
+
+#define Y_TEXT N_("Y offset")
+#define Y_LONGTEXT N_( \
+    "Y coordinate of the upper left corner in the mosaic if non negative." )
-
-#define CFG_PREFIX "sout-mosaic-bridge-"
@@ -167 +188 @@
-                     NULL, NULL, VFILTER_TEXT, VFILTER_LONGTEXT, false );
-
+    add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
+                            ALPHA_TEXT, ALPHA_LONGTEXT, false );
+    add_integer( CFG_PREFIX "x", -1, NULL, X_TEXT, X_LONGTEXT, false );
+    add_integer( CFG_PREFIX "y", -1, NULL, Y_TEXT, Y_LONGTEXT, false );
+
-    set_callbacks( Open, Close );
-vlc_module_end();
-
-static const char *ppsz_sout_options[] = {
-
+"alpha", "x", "y", 
-};
-
@@ -205 +231 @@
-    p_sys->i_height =
-        var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "height" );
-
-
+
-
-    p_sys->i_width =
-        var_CreateGetIntegerCommand( p_stream, CFG_PREFIX "width" );
-
-
+
-
-    var_Get( p_stream, CFG_PREFIX "sar", &val );
@@ -246 +270 @@
-        msg_Dbg( p_stream, "Forcing image chroma to 0x%.8x (%4.4s)", p_sys->i_chroma, (char*)&p_sys->i_chroma );
-    }
+
+#define INT_COMMAND( a ) \
+    var_Create( p_stream, CFG_PREFIX #a, \
+                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT | VLC_VAR_ISCOMMAND ); \
+    var_AddCallback( p_stream, CFG_PREFIX #a, a ## Callback, \
+                     p_stream );
+    INT_COMMAND( alpha )
+    INT_COMMAND( x )
+    INT_COMMAND( y )
-
-    p_stream->pf_add    = Add;
@@ -350 +383 @@
-
-    p_sys->p_es = p_es = p_bridge->pp_es[i];
+
+    p_es->i_alpha = var_GetInteger( p_stream, CFG_PREFIX "alpha" );
+    p_es->i_x = var_GetInteger( p_stream, CFG_PREFIX "x" );
+    p_es->i_y = var_GetInteger( p_stream, CFG_PREFIX "y" );
-
-    //p_es->fmt = *p_fmt;
@@ -852 +889 @@
- * Callback to update (some) params on the fly
- **********************************************************************/
-MosaicBridge
-      
-      
+Height
+
+
-{
-    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
-    sout_stream_t *p_stream = (sout_stream_t *)p_data;
-    sout_stream_sys_t *p_sys = p_stream->p_sys;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

modules/video_filter/mosaic.c

@@ -2 +2 @@
- * mosaic.c : Mosaic video plugin for vlc
- *****************************************************************************
-7
+8
- * $Id$
- *
-@via.ecp.fr
+ at videolan dot org
- *          Christophe Massiot <massiot@via.ecp.fr>
- *
@@ -182 +182 @@
-    set_callbacks( CreateFilter, DestroyFilter );
-
-( CFG_PREFIX "alpha"
-
+_with_range( CFG_PREFIX "alpha", 255, 0
+           
-
-    add_integer( CFG_PREFIX "height", 100, NULL,
@@ -665 +665 @@
-        }
-
-
+
+
+
+
+
+
-        {
-            p_region->i_x = p_sys->pi_x_offsets[i_real_index];
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        + i_col * ( p_sys->i_width / p_sys->i_cols )
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        p_region->i_align = p_sys->i_align;
+        p_region->i_alpha = p_es->i_alpha;
-
-        if( p_region_prev == NULL )

modules/video_filter/mosaic.h

@@ -30 +30 @@
-    bool b_empty;
-    char *psz_id;
+
+    int i_alpha;
+    int i_x;
+    int i_y;
-} bridged_es_t;
-