Blend: Remove unuseful variable. CID 241

[vlc] / modules / video_filter / alphamask.c

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index c1fa05c847096c75bc35ea552d247f667970b4f1..b1cacbd7302f046cbbbab948733461a4a3ba371e 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -2,7 +2,7 @@
  * alphamask.c : Alpha layer mask video filter for vlc
  *****************************************************************************
  * Copyright (C) 2007 the VideoLAN team
- * $Id: invert.c 18062 2006-11-26 14:20:34Z zorglub $
+ * $Id$
  *
  * Authors: Antoine Cellerier <dionoea at videolan tod org>
  *
@@ -25,7 +25,12 @@
  * Preamble
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_vout.h>
 
 #include <vlc_image.h>
@@ -36,7 +41,7 @@
 
 #define MASK_TEXT N_("Transparency mask")
 #define MASK_LONGTEXT N_( \
-    "Alpha blending transparency mask. Use's a png alpha channel.")
+    "Alpha blending transparency mask. Uses a png alpha channel.")
 
 #define CFG_PREFIX "alphamask-"
 
@@ -55,8 +60,8 @@ static int MaskCallback( vlc_object_t *, char const *,
  * Module descriptor
  *****************************************************************************/
 vlc_module_begin();
-    set_description( _("Alpha mask video filter") );
-    set_shortname( _("Alpha mask" ));
+    set_description( N_("Alpha mask video filter") );
+    set_shortname( N_("Alpha mask" ));
     set_help( ALPHAMASK_HELP );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -66,10 +71,10 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 
     add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
-                MASK_LONGTEXT, VLC_FALSE );
+                MASK_LONGTEXT, false );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "mask", NULL
 };
 
@@ -97,16 +102,13 @@ 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,
                        p_filter->p_cfg );
 
-    vlc_mutex_init( p_filter, &p_sys->mask_lock );
+    vlc_mutex_init( &p_sys->mask_lock );
     psz_string =
         var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
     var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
@@ -133,7 +135,7 @@ static void Destroy( vlc_object_t *p_this )
 
     vlc_mutex_destroy( &p_sys->mask_lock );
     if( p_filter->p_sys->p_mask )
-        p_filter->p_sys->p_mask->pf_release( p_filter->p_sys->p_mask );
+        picture_Release( p_filter->p_sys->p_mask );
 
     free( p_filter->p_sys );
 }
@@ -150,7 +152,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         || p_mask->i_visible_lines
         != p_apic->i_visible_lines )
     {
-        msg_Warn( p_filter,
+        msg_Err( p_filter,
                   "Mask size (%d x %d) and image size (%d x %d) "
                   "don't match. The mask will not be applied.",
                   p_mask->i_visible_pitch,
@@ -160,33 +162,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     }
     else
     {
-        if( p_mask->i_pitch != p_apic->i_pitch
-        ||  p_mask->i_lines != p_apic->i_lines )
-        {
-            /* visible plane sizes match ... but not the underlying
-             * buffer. I'm not sure that this can happen,
-             * but better safe than sorry. */
-            int i_line;
-            int i_lines = p_mask->i_visible_lines;
-            uint8_t *p_src = p_mask->p_pixels;
-            uint8_t *p_dst = p_apic->p_pixels;
-            int i_src_pitch = p_mask->i_pitch;
-            int i_dst_pitch = p_apic->i_pitch;
-            int i_visible_pitch = p_mask->i_visible_pitch;
-            for( i_line = 0; i_line < i_lines; i_line++,
-                 p_src += i_src_pitch, p_dst += i_dst_pitch )
-            {
-                p_filter->p_libvlc->pf_memcpy(
-                    p_dst, p_src, i_visible_pitch );
-            }
-        }
-        else
-        {
-            /* plane sizes match */
-            p_filter->p_libvlc->pf_memcpy(
-                p_apic->p_pixels, p_mask->p_pixels,
-                p_mask->i_pitch * p_mask->i_lines );
-        }
+        plane_CopyPixels( p_apic, p_mask );
     }
     vlc_mutex_unlock( &p_sys->mask_lock );
     return p_pic;
@@ -201,7 +177,7 @@ static void LoadMask( filter_t *p_filter, const char *psz_filename )
     memset( &fmt_out, 0, sizeof( video_format_t ) );
     fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
     if( p_filter->p_sys->p_mask )
-        p_filter->p_sys->p_mask->pf_release( p_filter->p_sys->p_mask );
+        picture_Release( p_filter->p_sys->p_mask );
     p_image = image_HandlerCreate( p_filter );
     p_filter->p_sys->p_mask =
         image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
@@ -215,6 +191,7 @@ static int MaskCallback( vlc_object_t *p_this, char const *psz_var,
                          vlc_value_t oldval, vlc_value_t newval,
                          void *p_data )
 {
+    VLC_UNUSED(p_this); VLC_UNUSED(oldval);
     filter_t *p_filter = (filter_t *)p_data;
     filter_sys_t *p_sys = p_filter->p_sys;
     int i_ret = VLC_SUCCESS;
@@ -235,7 +212,7 @@ static int MaskCallback( vlc_object_t *p_this, char const *psz_var,
         }
         else if( p_sys->p_mask )
         {
-            p_sys->p_mask->pf_release( p_sys->p_mask );
+            picture_Release( p_sys->p_mask );
             p_sys->p_mask = NULL;
         }
         vlc_mutex_unlock( &p_sys->mask_lock );