Fix memleak in opencv.

[vlc] / modules / video_filter / motionblur.c

diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index 10faa7ad849aa23f924f0e6e1679d410ef6f3e6c..4b9bafeb7172fa7a6e02b2ef0d13c3b4f60fd57c 100644 (file)
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -25,13 +25,17 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 #include <vlc_filter.h>
+#include "filter_picture.h"
 
 /*****************************************************************************
  * Local protypes
@@ -40,7 +44,9 @@ static int  Create       ( vlc_object_t * );
 static void Destroy      ( vlc_object_t * );
 static picture_t *Filter ( filter_t *, picture_t * );
 static void RenderBlur   ( filter_sys_t *, picture_t *, picture_t * );
-static void Copy         ( filter_t *, uint8_t **, picture_t * );
+static void Copy         ( filter_t *, picture_t * );
+static int MotionBlurCallback( vlc_object_t *, char const *,
+                               vlc_value_t, vlc_value_t, void * );
 
 /*****************************************************************************
  * Module descriptor
@@ -51,21 +57,21 @@ static void Copy         ( filter_t *, uint8_t **, picture_t * );
 #define FILTER_PREFIX "blur-"
 
 vlc_module_begin();
-    set_shortname( _("Motion blur") );
-    set_description( _("Motion blur filter") );
+    set_shortname( N_("Motion blur") );
+    set_description( N_("Motion blur filter") );
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL,
-                            FACTOR_TEXT, FACTOR_LONGTEXT, VLC_FALSE );
+                            FACTOR_TEXT, FACTOR_LONGTEXT, false );
 
     add_shortcut( "blur" );
 
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
     "factor", NULL
 };
 
@@ -90,20 +96,17 @@ 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_filter->pf_video_filter = Filter;
 
     config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
                        p_filter->p_cfg );
 
-    var_Create( p_filter, FILTER_PREFIX "factor",
-                VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
     p_filter->p_sys->i_factor =
-        var_GetInteger( p_filter, FILTER_PREFIX "factor" );
+        var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "factor" );
+    var_AddCallback( p_filter, FILTER_PREFIX "factor",
+                     MotionBlurCallback, p_filter->p_sys );
 
     p_filter->p_sys->pp_planes = NULL;
     p_filter->p_sys->i_planes = 0;
@@ -124,17 +127,6 @@ static void Destroy( vlc_object_t *p_this )
     free( p_filter->p_sys );
 }
 
-#define RELEASE( pic ) \
-        if( pic ->pf_release ) \
-            pic ->pf_release( pic );
-
-#define INITPIC( dst, src ) \
-    dst ->date = src ->date; \
-    dst ->b_force = src ->b_force; \
-    dst ->i_nb_fields = src ->i_nb_fields; \
-    dst ->b_progressive = src->b_progressive; \
-    dst ->b_top_field_first = src ->b_top_field_first;
-
 /*****************************************************************************
  * Filter
  *****************************************************************************/
@@ -145,14 +137,12 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
 
     if( !p_pic ) return NULL;
 
-    p_outpic = p_filter->pf_vout_buffer_new( p_filter );
+    p_outpic = filter_NewPicture( p_filter );
     if( !p_outpic )
     {
-        msg_Warn( p_filter, "can't get output picture" );
-        RELEASE( p_pic );
+        picture_Release( p_pic );
         return NULL;
     }
-    INITPIC( p_outpic, p_pic );
 
     if( !p_sys->pp_planes )
     {
@@ -166,15 +156,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
             p_sys->pp_planes[i_plane] = (uint8_t*)malloc(
                 p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines );
         }
-        Copy( p_filter, p_sys->pp_planes, p_pic );
+        Copy( p_filter, p_pic );
     }
 
     /* Get a new picture */
     RenderBlur( p_sys, p_pic, p_outpic );
-    Copy( p_filter, p_sys->pp_planes, p_outpic );
+    Copy( p_filter, p_outpic );
 
-    RELEASE( p_pic );
-    return p_outpic;
+    return CopyInfoAndRelease( p_outpic, p_pic );
 }
 
 /*****************************************************************************
@@ -214,13 +203,24 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic,
     }
 }
 
-static void Copy( filter_t *p_filter, uint8_t **pp_planes, picture_t *p_pic )
+static void Copy( filter_t *p_filter, picture_t *p_pic )
 {
     int i_plane;
     for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
     {
-        p_filter->p_libvlc->pf_memcpy(
+        vlc_memcpy(
             p_filter->p_sys->pp_planes[i_plane], p_pic->p[i_plane].p_pixels,
             p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines );
     }
 }
+
+static int MotionBlurCallback( 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_sys_t *p_sys = (filter_sys_t *)p_data;
+    if( !strcmp( psz_var, FILTER_PREFIX "factor" ) )
+        p_sys->i_factor = __MIN( 127, __MAX( 1, newval.i_int ) );
+    return VLC_SUCCESS;
+}