Use picture helpers (Yield,Release,CopyProperties).

[vlc] / modules / video_filter / erase.c

diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c
index 482c2f96ae955284abf901386f7310daa9bdbc7a..cde3a8a362b68f8a3b52ca2b220398d54ec7c520 100644 (file)
--- a/modules/video_filter/erase.c
+++ b/modules/video_filter/erase.c
@@ -29,12 +29,14 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 #include "vlc_image.h"
 
 #include "vlc_filter.h"
+#include "filter_picture.h"
 
 /*****************************************************************************
  * Local prototypes
@@ -61,8 +63,8 @@ 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 );
@@ -76,7 +78,7 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "mask", "x", "y", NULL
 };
 
@@ -105,7 +107,7 @@ static void LoadMask( filter_t *p_filter, const char *psz_filename )
     if( p_filter->p_sys->p_mask )
     {
         if( p_old_mask )
-            p_old_mask->pf_release( p_old_mask );
+            picture_Release( p_old_mask );
     }
     else if( p_old_mask )
     {
@@ -144,10 +146,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;
 
     p_filter->pf_video_filter = Filter;
@@ -174,7 +173,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;
 }
@@ -187,7 +186,7 @@ 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;
     if( p_sys->p_mask )
-        p_sys->p_mask->pf_release( p_sys->p_mask );
+        picture_Release( p_sys->p_mask );
 
     vlc_mutex_destroy( &p_sys->lock );
 
@@ -207,24 +206,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     if( !p_outpic )
     {
         msg_Warn( p_filter, "can't get output picture" );
-        if( p_pic->pf_release )
-            p_pic->pf_release( p_pic );
+        picture_Release( p_pic );
         return NULL;
     }
 
     /* Here */
     FilterErase( p_filter, p_pic, p_outpic );
 
-    p_outpic->date = p_pic->date;
-    p_outpic->b_force = p_pic->b_force;
-    p_outpic->i_nb_fields = p_pic->i_nb_fields;
-    p_outpic->b_progressive = p_pic->b_progressive;
-    p_outpic->b_top_field_first = p_pic->b_top_field_first;
-
-    if( p_pic->pf_release )
-        p_pic->pf_release( p_pic );
-
-    return p_outpic;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }
 
 /*****************************************************************************