Use vlc_memset/vlc_memcpy

[vlc] / modules / video_filter / motionblur.c

diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c
index a92e46b31cc6b0f7ef0f8a59fd27548b56deef6f..0ebfbdc281b22f29ff6281f1df8f6d20bcc091ff 100644 (file)
--- a/modules/video_filter/motionblur.c
+++ b/modules/video_filter/motionblur.c
@@ -25,8 +25,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
@@ -40,7 +42,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
@@ -48,9 +52,6 @@ static void Copy         ( filter_t *, uint8_t **, picture_t * );
 #define FACTOR_TEXT N_("Blur factor (1-127)")
 #define FACTOR_LONGTEXT N_("The degree of blurring from 1 to 127.")
 
-#define PERSISTANT_TEXT N_("Keep inifinte memory of past images")
-#define PERSISTANT_LONGTEXT N_("Use \"Result = ( new image * ( 128 - factor ) + factor * old result ) / 128\" instead of \"Result = ( new image * ( 128 - factor ) + factor * old image ) / 128\".")
-
 #define FILTER_PREFIX "blur-"
 
 vlc_module_begin();
@@ -61,9 +62,7 @@ vlc_module_begin();
     set_subcategory( SUBCAT_VIDEO_VFILTER );
 
     add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL,
-                            FACTOR_TEXT, FACTOR_LONGTEXT, VLC_FALSE );
-    add_bool( FILTER_PREFIX "persistant", 0, NULL, PERSISTANT_TEXT,
-              PERSISTANT_LONGTEXT, VLC_FALSE );
+                            FACTOR_TEXT, FACTOR_LONGTEXT, false );
 
     add_shortcut( "blur" );
 
@@ -71,7 +70,7 @@ vlc_module_begin();
 vlc_module_end();
 
 static const char *ppsz_filter_options[] = {
-    "factor", "persistant", NULL
+    "factor", NULL
 };
 
 /*****************************************************************************
@@ -80,7 +79,6 @@ static const char *ppsz_filter_options[] = {
 struct filter_sys_t
 {
     int        i_factor;
-    vlc_bool_t b_persistant;
 
     uint8_t  **pp_planes;
     int        i_planes;
@@ -106,14 +104,10 @@ static int Create( vlc_object_t *p_this )
     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_Create( p_filter, FILTER_PREFIX "persistant",
-                VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-    p_filter->p_sys->b_persistant =
-        var_GetBool( p_filter, FILTER_PREFIX "persistant" );
+        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;
@@ -176,12 +170,12 @@ 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_sys->b_persistant ? p_outpic : p_pic );
+    Copy( p_filter, p_outpic );
 
     RELEASE( p_pic );
     return p_outpic;
@@ -224,13 +218,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;
+}