Used VLC_CODEC_* and vlc_fourcc_GetCodec when suitable.

[vlc] / modules / video_filter / bluescreen.c

diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c
index ed0b5ae2062e27b191754ac98b271c779cf3a3d6..0316013a1a9bb39c86a015a0ad9385410021d8d7 100644 (file)
--- a/modules/video_filter/bluescreen.c
+++ b/modules/video_filter/bluescreen.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include "vlc_filter.h"
@@ -37,8 +38,8 @@
 #define BLUESCREEN_HELP N_( \
     "This effect, also known as \"greenscreen\" or \"chroma key\" blends " \
     "the \"blue parts\" of the foreground image of the mosaic on the " \
-    "background (like weather forcasts). You can choose the \"key\" " \
-    "color for blending (blyyue by default)." )
+    "background (like weather forecasts). You can choose the \"key\" " \
+    "color for blending (blue by default)." )
 
 #define BLUESCREENU_TEXT N_("Bluescreen U value")
 #define BLUESCREENU_LONGTEXT N_( \
@@ -74,29 +75,29 @@ static int BluescreenCallback( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    set_description( _("Bluescreen video filter") );
-    set_shortname( _("Bluescreen" ));
-    set_help( BLUESCREEN_HELP );
-    set_category( CAT_VIDEO );
-    set_subcategory( SUBCAT_VIDEO_VFILTER );
-    set_capability( "video filter2", 0 );
-    add_shortcut( "bluescreen" );
-    set_callbacks( Create, Destroy );
+vlc_module_begin ()
+    set_description( N_("Bluescreen video filter") )
+    set_shortname( N_("Bluescreen" ))
+    set_help( BLUESCREEN_HELP )
+    set_category( CAT_VIDEO )
+    set_subcategory( SUBCAT_VIDEO_VFILTER )
+    set_capability( "video filter2", 0 )
+    add_shortcut( "bluescreen" )
+    set_callbacks( Create, Destroy )
 
     add_integer_with_range( CFG_PREFIX "u", 120, 0, 255, NULL,
-                            BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false );
+                            BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, false )
     add_integer_with_range( CFG_PREFIX "v", 90, 0, 255, NULL,
-                            BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, false );
+                            BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, false )
     add_integer_with_range( CFG_PREFIX "ut", 17, 0, 255, NULL,
                             BLUESCREENUTOL_TEXT, BLUESCREENUTOL_LONGTEXT,
-                            false );
+                            false )
     add_integer_with_range( CFG_PREFIX "vt", 17, 0, 255, NULL,
                             BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT,
-                            false );
-vlc_module_end();
+                            false )
+vlc_module_end ()
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "u", "v", "ut", "vt", NULL
 };
 
@@ -111,7 +112,7 @@ static int Create( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
 
-    if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') )
+    if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
                  "Unsupported input chroma \"%4s\". "
@@ -123,10 +124,7 @@ static int Create( vlc_object_t *p_this )
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
     p_sys = p_filter->p_sys;
 
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
@@ -142,6 +140,7 @@ static int Create( vlc_object_t *p_this )
     GET_VAR( ut, 0x00, 0xff );
     GET_VAR( vt, 0x00, 0xff );
     p_sys->p_at = NULL;
+#undef GET_VAR
 
     p_filter->pf_video_filter = Filter;
 
@@ -151,9 +150,15 @@ static int Create( vlc_object_t *p_this )
 static void Destroy( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
+    filter_sys_t *p_sys = p_filter->p_sys;
+
+    var_DelCallback( p_filter, CFG_PREFIX "u", BluescreenCallback, p_sys );
+    var_DelCallback( p_filter, CFG_PREFIX "v", BluescreenCallback, p_sys );
+    var_DelCallback( p_filter, CFG_PREFIX "ut", BluescreenCallback, p_sys );
+    var_DelCallback( p_filter, CFG_PREFIX "vt", BluescreenCallback, p_sys );
 
-    free( p_filter->p_sys->p_at );
-    free( p_filter->p_sys );
+    free( p_sys->p_at );
+    free( p_sys );
 }
 
 static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
@@ -169,7 +174,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     uint8_t *p_v = p_pic->p[ V_PLANE ].p_pixels;
     uint8_t umin, umax, vmin, vmax;
 
-    if( p_pic->format.i_chroma != VLC_FOURCC('Y','U','V','A') )
+    if( p_pic->format.i_chroma != VLC_CODEC_YUVA )
     {
         msg_Err( p_filter,
                  "Unsupported input chroma \"%4s\". "
@@ -199,7 +204,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         }
     }
     /* Gaussian convolution to make it look cleaner */
-    p_filter->p_libvlc->pf_memset( p_a, 0, 2 * i_pitch );
+    vlc_memset( p_a, 0, 2 * i_pitch );
     for( i = 2; i < i_lines - 2; i++ )
     {
         p_a[i*i_pitch] = 0x00;