Alpha mask: thread-safety

[vlc] / modules / video_filter / alphamask.c

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index 1f90294a7caf409daa46b39b42521939bd4da0de..af46bd7a641092976a64084cd039544c6958dd5e 100644 (file)
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -59,20 +59,20 @@ static int MaskCallback( vlc_object_t *, char const *,
 /*****************************************************************************
  * Module descriptor
  *****************************************************************************/
-vlc_module_begin();
-    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 );
-    set_capability( "video filter2", 0 );
-    add_shortcut( "alphamask" );
-    add_shortcut( "mask" );
-    set_callbacks( Create, Destroy );
+vlc_module_begin ()
+    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 )
+    set_capability( "video filter2", 0 )
+    add_shortcut( "alphamask" )
+    add_shortcut( "mask" )
+    set_callbacks( Create, Destroy )
 
     add_string( CFG_PREFIX "mask", NULL, NULL, MASK_TEXT,
-                MASK_LONGTEXT, false );
-vlc_module_end();
+                MASK_LONGTEXT, false )
+vlc_module_end ()
 
 static const char *const ppsz_filter_options[] = {
     "mask", NULL
@@ -108,11 +108,6 @@ static int Create( vlc_object_t *p_this )
     config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
-    vlc_mutex_init( &p_sys->mask_lock );
-    psz_string =
-        var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
-    var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
-                     p_filter );
     p_sys->p_mask = NULL;
     if( psz_string && *psz_string )
     {
@@ -123,6 +118,11 @@ static int Create( vlc_object_t *p_this )
     }
     free( psz_string );
 
+    vlc_mutex_init( &p_sys->mask_lock );
+    psz_string =
+        var_CreateGetStringCommand( p_filter, CFG_PREFIX "mask" );
+    var_AddCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
+                     p_filter );
     p_filter->pf_video_filter = Filter;
 
     return VLC_SUCCESS;
@@ -133,11 +133,14 @@ 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 "mask", MaskCallback,
+                     p_filter );
+
     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 );
+    if( p_sys->p_mask )
+        picture_Release( p_sys->p_mask );
 
-    free( p_filter->p_sys );
+    free( p_sys );
 }
 
 static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
@@ -152,7 +155,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,
@@ -162,31 +165,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 )
-            {
-                vlc_memcpy( p_dst, p_src, i_visible_pitch );
-            }
-        }
-        else
-        {
-            /* plane sizes match */
-            vlc_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 +180,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 );
@@ -236,7 +215,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 );