X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmotiondetect.c;h=7f3c706a98e457bd806ea4bcc49a3bd657f2d5b9;hb=5e15258c9ef28558fe2abc941fc1527e02b04c21;hp=963b34536f1d8cee9ea9ca67a0a0211b81bea673;hpb=81c5ac29fa2e80426c1b1dfcc941a1aabe8bc808;p=vlc

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 963b34536f..7f3c706a98 100644
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -24,9 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 
@@ -48,8 +52,8 @@ static void GaussianConvolution( uint32_t *, uint32_t *, int, int, int );
 #define FILTER_PREFIX "motiondetect-"
 
 vlc_module_begin();
-    set_description( _("Motion detect video filter") );
-    set_shortname( _( "Motion Detect" ));
+    set_description( N_("Motion detect video filter") );
+    set_shortname( N_( "Motion Detect" ));
     set_capability( "video filter2", 0 );
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
@@ -58,12 +62,6 @@ vlc_module_begin();
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
-#if 0
-static const char *ppsz_filter_options[] = {
-    NULL
-};
-#endif
-
 struct filter_sys_t
 {
     uint8_t *p_oldpix;
@@ -94,11 +92,7 @@ static int Create( vlc_object_t *p_this )
     p_filter->p_sys->p_oldpix = NULL;
     p_filter->p_sys->p_buf = NULL;
 
-#if 0
-    config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
-                   p_filter->p_cfg );
-#endif
-    vlc_mutex_init( p_filter, &p_filter->p_sys->lock );
+    vlc_mutex_init( &p_filter->p_sys->lock );
 
     return VLC_SUCCESS;
 }
@@ -158,11 +152,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     }
 
     p_outpix = p_outpic->p[Y_PLANE].p_pixels;
-    p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
-                                   p_inpic->p[U_PLANE].p_pixels,
+    vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels,
         p_inpic->p[U_PLANE].i_pitch * p_inpic->p[U_PLANE].i_visible_lines );
-    p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
-                                   p_inpic->p[V_PLANE].p_pixels,
+    vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels,
         p_inpic->p[V_PLANE].i_pitch * p_inpic->p[V_PLANE].i_visible_lines );
 
     if( !p_sys->p_oldpix || !p_sys->p_buf )
@@ -387,14 +379,13 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
         {
             if( colors[j] != j ) continue;
             if( color_x_min[j] == -1 ) continue;
-#define max( a, b ) ( a > b ? a : b )
-#define min( a, b ) ( a < b ? a : b )
-            if( max( color_x_min[i], color_x_min[j] ) < min( color_x_max[i], color_x_max[j] ) && max( color_y_min[i], color_y_min[j] ) < min( color_y_max[i], color_y_max[j] ) )
+            if( __MAX( color_x_min[i], color_x_min[j] ) < __MIN( color_x_max[i], color_x_max[j] ) &&
+                __MAX( color_y_min[i], color_y_min[j] ) < __MIN( color_y_max[i], color_y_max[j] ) )
             {
-                color_x_min[i] = min( color_x_min[i], color_x_min[j] );
-                color_x_max[i] = max( color_x_max[i], color_x_max[j] );
-                color_y_min[i] = min( color_y_min[i], color_y_min[j] );
-                color_y_max[i] = max( color_y_max[i], color_y_max[j] );
+                color_x_min[i] = __MIN( color_x_min[i], color_x_min[j] );
+                color_x_max[i] = __MAX( color_x_max[i], color_x_max[j] );
+                color_y_min[i] = __MIN( color_y_min[i], color_y_min[j] );
+                color_y_max[i] = __MAX( color_y_max[i], color_y_max[j] );
                 color_x_min[j] = -1;
                 j = 0;
             }
@@ -440,12 +431,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     /**
      * We're done. Lets keep a copy of the picture
      */
-    p_filter->p_libvlc->pf_memcpy( p_oldpix, p_inpix,
-                                   i_src_pitch * i_num_lines );
-    p_filter->p_libvlc->pf_memcpy( p_oldpix_u, p_inpix_u,
-                                   i_src_pitch_u * i_num_lines_u );
-    p_filter->p_libvlc->pf_memcpy( p_oldpix_v, p_inpix_v,
-                                   i_src_pitch_u * i_num_lines_u );
+    vlc_memcpy( p_oldpix, p_inpix, i_src_pitch * i_num_lines );
+    vlc_memcpy( p_oldpix_u, p_inpix_u, i_src_pitch_u * i_num_lines_u );
+    vlc_memcpy( p_oldpix_v, p_inpix_v, i_src_pitch_u * i_num_lines_u );
 
     vlc_mutex_unlock( &p_filter->p_sys->lock );