Forgotten mem leak.

[vlc] / modules / video_filter / blendbench.c

diff --git a/modules/video_filter/blendbench.c b/modules/video_filter/blendbench.c
index 5a6214b820cf00a6e3b92ce86ea398c1f84e76a0..0c93a9f23114d4e318f48de089702ea7db543d8c 100644 (file)
--- a/modules/video_filter/blendbench.c
+++ b/modules/video_filter/blendbench.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 
@@ -70,34 +71,34 @@ static picture_t *Filter( filter_t *, picture_t * );
 #define CFG_PREFIX "blendbench-"
 
 vlc_module_begin();
-    set_description( _("Blending benchmark filter") );
-    set_shortname( _("blendbench" ));
+    set_description( N_("Blending benchmark filter") );
+    set_shortname( N_("blendbench" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
 
     set_section( N_("Benchmarking"), NULL );
     add_integer( CFG_PREFIX "loops", 1000, NULL, LOOPS_TEXT,
-              LOOPS_LONGTEXT, VLC_FALSE );
+              LOOPS_LONGTEXT, false );
     add_integer_with_range( CFG_PREFIX "alpha", 128, 0, 255, NULL, ALPHA_TEXT,
-              ALPHA_LONGTEXT, VLC_FALSE );
+              ALPHA_LONGTEXT, false );
 
     set_section( N_("Base image"), NULL );
     add_file( CFG_PREFIX "base-image", NULL, NULL, BASE_IMAGE_TEXT,
-              BASE_IMAGE_LONGTEXT, VLC_FALSE );
+              BASE_IMAGE_LONGTEXT, false );
     add_string( CFG_PREFIX "base-chroma", "I420", NULL, BASE_CHROMA_TEXT,
-              BASE_CHROMA_LONGTEXT, VLC_FALSE );
+              BASE_CHROMA_LONGTEXT, false );
 
     set_section( N_("Blend image"), NULL );
     add_file( CFG_PREFIX "blend-image", NULL, NULL, BLEND_IMAGE_TEXT,
-              BLEND_IMAGE_LONGTEXT, VLC_FALSE );
+              BLEND_IMAGE_LONGTEXT, false );
     add_string( CFG_PREFIX "blend-chroma", "YUVA", NULL, BLEND_CHROMA_TEXT,
-              BLEND_CHROMA_LONGTEXT, VLC_FALSE );
+              BLEND_CHROMA_LONGTEXT, false );
 
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "loops", "alpha", "base-image", "base-chroma", "blend-image",
     "blend-chroma", NULL
 };
@@ -107,7 +108,7 @@ static const char *ppsz_filter_options[] = {
  *****************************************************************************/
 struct filter_sys_t
 {
-    vlc_bool_t b_done;
+    bool b_done;
     int i_loops, i_alpha;
 
     picture_t *p_base_image;
@@ -151,7 +152,7 @@ static int Create( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
-    char *psz_temp;
+    char *psz_temp, *psz_cmd;
 
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
@@ -159,7 +160,7 @@ static int Create( vlc_object_t *p_this )
         return VLC_ENOMEM;
 
     p_sys = p_filter->p_sys;
-    p_sys->b_done = VLC_FALSE;
+    p_sys->b_done = false;
 
     p_filter->pf_video_filter = Filter;
 
@@ -176,17 +177,21 @@ static int Create( vlc_object_t *p_this )
     psz_temp = var_CreateGetStringCommand( p_filter, CFG_PREFIX "base-chroma" );
     p_sys->i_base_chroma = VLC_FOURCC( psz_temp[0], psz_temp[1],
                                        psz_temp[2], psz_temp[3] );
+    psz_cmd = var_CreateGetStringCommand( p_filter, CFG_PREFIX "base-image" );
     blendbench_LoadImage( p_this, &p_sys->p_base_image, p_sys->i_base_chroma,
-               var_CreateGetStringCommand( p_filter, CFG_PREFIX "base-image" ),
-               "Base" );
+                          psz_cmd, "Base" );
+    free( psz_temp );
+    free( psz_cmd );
 
     psz_temp = var_CreateGetStringCommand( p_filter,
                                            CFG_PREFIX "blend-chroma" );
     p_sys->i_blend_chroma = VLC_FOURCC( psz_temp[0], psz_temp[1],
                                         psz_temp[2], psz_temp[3] );
+    psz_cmd = var_CreateGetStringCommand( p_filter, CFG_PREFIX "blend-image" );
     blendbench_LoadImage( p_this, &p_sys->p_blend_image, p_sys->i_blend_chroma,
-               var_CreateGetStringCommand( p_filter, CFG_PREFIX "blend-image" ),
-               "Blend" );
+                          psz_cmd, "Blend" );
+    free( psz_temp );
+    free( psz_cmd );
 
     return VLC_SUCCESS;
 }
@@ -199,8 +204,8 @@ 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;
 
-    p_sys->p_base_image->pf_release( p_sys->p_base_image );
-    p_sys->p_blend_image->pf_release( p_sys->p_blend_image );
+    picture_Release( p_sys->p_base_image );
+    picture_Release( p_sys->p_blend_image );
 }
 
 /*****************************************************************************
@@ -214,10 +219,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     if( p_sys->b_done )
         return p_pic;
 
-    p_blend = vlc_object_create( p_filter, VLC_OBJECT_FILTER );
+    p_blend = vlc_object_create( p_filter, sizeof(filter_t) );
     if( !p_blend )
     {
-        p_pic->pf_release( p_pic );
+        picture_Release( p_pic );
         return NULL;
     }
     vlc_object_attach( p_blend, p_filter );
@@ -226,7 +231,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     p_blend->p_module = module_Need( p_blend, "video blending", 0, 0 );
     if( !p_blend->p_module )
     {
-        p_pic->pf_release( p_pic );
+        picture_Release( p_pic );
         vlc_object_detach( p_blend );
         vlc_object_release( p_blend );
         return NULL;
@@ -254,6 +259,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     vlc_object_detach( p_blend );
     vlc_object_release( p_blend );
 
-    p_sys->b_done = VLC_TRUE;
+    p_sys->b_done = true;
     return p_pic;
 }