Use gettext_noop() consistently

[vlc] / modules / video_filter / erase.c

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index b9525348155d6f7531930c13d3d70bff96d77be8..45feb15a8c600bbd9f756d80b76f990fe6b94556 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -24,10 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 #include "vlc_image.h"
@@ -59,16 +62,16 @@ static int EraseCallback( vlc_object_t *, char const *,
 #define CFG_PREFIX "erase-"
 
 vlc_module_begin();
-    set_description( _("Erase video filter") );
-    set_shortname( _( "Erase" ));
+    set_description( N_("Erase video filter") );
+    set_shortname( N_( "Erase" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_file( CFG_PREFIX "mask", NULL, NULL,
-              MASK_TEXT, MASK_LONGTEXT, VLC_FALSE );
-    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
-    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
+              MASK_TEXT, MASK_LONGTEXT, false );
+    add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false );
+    add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false );
 
     add_shortcut( "erase" );
     set_callbacks( Create, Destroy );
@@ -122,6 +125,23 @@ static int Create( vlc_object_t *p_this )
     filter_sys_t *p_sys;
     char *psz_filename;
 
+    switch( p_filter->fmt_in.video.i_chroma )
+    {
+        case VLC_FOURCC('I','4','2','0'):
+        case VLC_FOURCC('I','Y','U','V'):
+        case VLC_FOURCC('J','4','2','0'):
+        case VLC_FOURCC('Y','V','1','2'):
+
+        case VLC_FOURCC('I','4','2','2'):
+        case VLC_FOURCC('J','4','2','2'):
+            break;
+
+        default:
+            msg_Err( p_filter, "Unsupported input chroma (%4s)",
+                     (char*)&(p_filter->fmt_in.video.i_chroma) );
+            return VLC_EGENERIC;
+    }
+
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
@@ -155,7 +175,7 @@ static int Create( vlc_object_t *p_this )
     var_AddCallback( p_filter, CFG_PREFIX "y", EraseCallback, p_sys );
     var_AddCallback( p_filter, CFG_PREFIX "mask", EraseCallback, p_sys );
 
-    vlc_mutex_init( p_filter, &p_sys->lock );
+    vlc_mutex_init( &p_sys->lock );
 
     return VLC_SUCCESS;
 }
@@ -183,23 +203,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     picture_t *p_outpic;
 
     if( !p_pic ) return NULL;
-    switch( p_pic->format.i_chroma )
-    {
-        case VLC_FOURCC('I','4','2','0'):
-        case VLC_FOURCC('I','Y','U','V'):
-        case VLC_FOURCC('J','4','2','0'):
-        case VLC_FOURCC('Y','V','1','2'):
-
-        case VLC_FOURCC('I','4','2','2'):
-        case VLC_FOURCC('J','4','2','2'):
-            break;
-        default:
-            msg_Warn( p_filter, "Unsupported input chroma (%4s)",
-                      (char*)&(p_pic->format.i_chroma) );
-            if( p_pic->pf_release )
-                p_pic->pf_release( p_pic );
-            return NULL;
-    }
 
     p_outpic = p_filter->pf_vout_buffer_new( p_filter );
     if( !p_outpic )
@@ -257,7 +260,7 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
         int i_height = i_mask_visible_lines;
         int i_width  = i_mask_visible_pitch;
 
-        const vlc_bool_t b_line_factor = ( i_plane /* U_PLANE or V_PLANE */ &&
+        const bool b_line_factor = ( i_plane /* U_PLANE or V_PLANE */ &&
             !( p_inpic->format.i_chroma == VLC_FOURCC('I','4','2','2')
             || p_inpic->format.i_chroma == VLC_FOURCC('J','4','2','2') ) );
 
@@ -275,7 +278,7 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
         i_width  = __MIN( i_visible_pitch - i_x, i_width  );
 
         /* Copy original pixel buffer */
-        p_filter->p_libvlc->pf_memcpy( p_outpix, p_inpix, i_pitch * i_lines );
+        vlc_memcpy( p_outpix, p_inpix, i_pitch * i_lines );
 
         /* Horizontal linear interpolation of masked areas */
         p_outpix = p_outpic->p[i_plane].p_pixels + i_y*i_pitch + i_x;
@@ -385,7 +388,7 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
         i_height = __MIN( i_visible_lines - i_y - 2, i_height );
         /* Make sure that we start at least 2 lines from the top (since our
          * bluring algorithm uses the 2 previous lines) */
-        y = __MAX(i_y-2,0);
+        y = __MAX(i_y,2);
         p_outpix = p_outpic->p[i_plane].p_pixels + (i_y+y)*i_pitch + i_x;
         for( ; y < i_height; y++, p_mask += i_mask_pitch, p_outpix += i_pitch )
         {
@@ -409,6 +412,7 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic,
 static int EraseCallback( vlc_object_t *p_this, char const *psz_var,
                           vlc_value_t oldval, vlc_value_t newval, void *p_data )
 {
+    VLC_UNUSED(oldval);
     filter_sys_t *p_sys = (filter_sys_t *)p_data;
 
     if( !strcmp( psz_var, CFG_PREFIX "x" ) )