Changeset 2ece18d460b0cc45527f3eaea9ba9d8fbcb9e3a5

Timestamp:

07/04/07 22:17:12 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

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

git-parent:

[57c44625f78bb0876b95521dd44615839ed85655]

git-author:

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

Message:

Mosaic:
Allow runtime changes of the bluescreen parameters
Cosmetics
Compilation warning fixes

Files:

• modules/video_filter/mosaic.c (modified) (21 diffs)

modules/video_filter/mosaic.c

@@ -94 +94 @@
- *****************************************************************************/
-#define ALPHA_TEXT N_("Transparency")
-
+
+
-        "0 means transparent, 255 opaque (default)." )
-
@@ -103 +104 @@
-
-#define XOFFSET_TEXT N_("Top left corner X coordinate")
-
+
+
-#define YOFFSET_TEXT N_("Top left corner Y coordinate")
-
+
+
+
-#define BORDERW_TEXT N_("Border width")
-
+
+
-#define BORDERH_TEXT N_("Border height")
-
+
+
-
-#define ALIGN_TEXT N_("Mosaic alignment" )
-#define ALIGN_LONGTEXT N_( \
-
-
-
+      
+      
+      
-
-#define POS_TEXT N_("Positioning method")
-
+
+
-        "automatically choose the best number of rows and columns. " \
-        "fixed: use the user-defined number of rows and columns. " \
@@ -124 +131 @@
-
-#define ROWS_TEXT N_("Number of rows")
-
+
+
-        "positionning method is set to \"fixed\")." )
+
-#define COLS_TEXT N_("Number of columns")
-
+
+
-        "positionning method is set to \"fixed\"." )
-
-#define AR_TEXT N_("Keep aspect ratio")
-
+
+
-        "mosaic elements." )
-#define KEEP_TEXT N_("Keep original size")
-
+
+
-
-#define ORDER_TEXT N_("Elements order" )
-
+
+
-        "the mosaic. You must give a comma-separated list of picture ID(s)." \
-        "These IDs are assigned in the \"mosaic-bridge\" module." )
-
-#define OFFSETS_TEXT N_("Offsets in order" )
-
-
+
+
+
-        "must give a comma-separated list of coordinates (eg: 10,10,150,10)." )
-
-#define DELAY_TEXT N_("Delay")
-
-
+
+
+
-        "values you will need to raise caching at input.")
-
-#define BLUESCREEN_TEXT N_("Bluescreen" )
-
-
-
-
+
+
+
+
+
-
-#define BLUESCREENU_TEXT N_("Bluescreen U value")
-
+
+
-        "(in YUV values). From 0 to 255. Defaults to 120 for blue." )
-#define BLUESCREENV_TEXT N_("Bluescreen V value")
-
+
+
-        "(in YUV values). From 0 to 255. Defaults to 90 for blue." )
-#define BLUESCREENUTOL_TEXT N_("Bluescreen U tolerance")
-
+
+
-        "on color variations for the U plane. A value between 10 and 20 " \
-        "seems sensible." )
-#define BLUESCREENVTOL_TEXT N_("Bluescreen V tolerance")
-
+
+
-        "on color variations for the V plane. A value between 10 and 20 " \
-        "seems sensible." )
@@ -191 +211 @@
-    set_callbacks( CreateFilter, DestroyFilter );
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        change_integer_list( pi_align_values, ppsz_align_descriptions, 0 );
-
-
-
+
+
+
+
+
+
+
+
-        add_deprecated( CFG_PREFIX "vborder", VLC_FALSE );
-
+
+
-        add_deprecated( CFG_PREFIX "hborder", VLC_FALSE );
-
-
+
+
-        change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
-                 VLC_FALSE );
-
+    set_section( N_("Bluescreen effect"), NULL );
-    add_bool( CFG_PREFIX "bs", 0, NULL, BLUESCREEN_TEXT,
-              BLUESCREEN_LONGTEXT, VLC_FALSE );
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX );
@@ -535 +580 @@
-            }
-        }
-((int)ceil(sqrt( (float)i_numpics )
+ceil(sqrt( (double)i_numpics 
-        p_sys->i_cols = ( i_numpics % p_sys->i_rows == 0 ?
-                            i_numpics / p_sys->i_rows :
@@ -551 +596 @@
-    {
-        bridged_es_t *p_es = p_bridge->pp_es[i_index];
- = {0}, fmt_out = {0}
+, fmt_out
-        picture_t *p_converted;
+
+        memset( &fmt_in, 0, sizeof( video_format_t ) );
+        memset( &fmt_out, 0, sizeof( video_format_t ) );
-
-        if ( p_es->b_empty )
@@ -836 +884 @@
-{
-    filter_sys_t *p_sys = (filter_sys_t *) p_data;
-
+
+
+
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -844 +894 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -852 +902 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -860 +910 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -868 +918 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -876 +926 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        int i_old = 0, i_new = 0;
@@ -891 +941 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -899 +949 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -907 +957 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        if( newval.i_int > 1 || newval.i_int < 0 )
@@ -917 +967 @@
-            vlc_mutex_lock( &p_sys->lock );
-            msg_Dbg( p_this, "changing position method from %d (%s) to %d (%s)",
-         
-         
+
+
-            p_sys->i_position = newval.i_int;
-            vlc_mutex_unlock( &p_sys->lock );
-        }
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -931 +981 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -939 +989 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        char *psz_order;
@@ -976 +1026 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -992 +1042 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
-!strcmp( psz_var, CFG_PREFIX
+VAR_IS(
-    {
-        vlc_mutex_lock( &p_sys->lock );
@@ -1007 +1057 @@
-        vlc_mutex_unlock( &p_sys->lock );
-    }
+    else if( VAR_IS( "bs" ) )
+    {
+        vlc_mutex_lock( &p_sys->lock );
+        p_sys->b_bs = newval.b_bool;
+        vlc_mutex_unlock( &p_sys->lock );
+    }
+    else if( VAR_IS( "bsu" ) )
+    {
+        vlc_mutex_lock( &p_sys->lock );
+        p_sys->i_bsu = __MAX( 0, __MIN( 255, newval.i_int ) );
+        vlc_mutex_unlock( &p_sys->lock );
+    }
+    else if( VAR_IS( "bsv" ) )
+    {
+        vlc_mutex_lock( &p_sys->lock );
+        p_sys->i_bsv = __MAX( 0, __MIN( 255, newval.i_int ) );
+        vlc_mutex_unlock( &p_sys->lock );
+    }
+    else if( VAR_IS( "bsut" ) )
+    {
+        vlc_mutex_lock( &p_sys->lock );
+        p_sys->i_bsut = __MAX( 0, __MIN( 255, newval.i_int ) );
+        vlc_mutex_unlock( &p_sys->lock );
+    }
+    else if( VAR_IS( "bsvt" ) )
+    {
+        vlc_mutex_lock( &p_sys->lock );
+        p_sys->i_bsvt = __MAX( 0, __MIN( 255, newval.i_int ) );
+        vlc_mutex_unlock( &p_sys->lock );
+    }
-    return VLC_SUCCESS;
-}