A lot of missing const in options lists

[vlc] / modules / video_filter / motiondetect.c

diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c
index 26f4edd53f48be726f67b928c07a24e42263a109..7f3c706a98e457bd806ea4bcc49a3bd657f2d5b9 100644 (file)
--- a/modules/video_filter/motiondetect.c
+++ b/modules/video_filter/motiondetect.c
@@ -24,12 +24,13 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 
-#include <math.h>                                            /* sin(), cos() */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_vout.h>
 
@@ -51,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 );
@@ -61,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;
@@ -97,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;
 }
@@ -137,7 +128,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     const uint8_t *p_inpix_u = p_inpic->p[U_PLANE].p_pixels;
     const uint8_t *p_inpix_v = p_inpic->p[V_PLANE].p_pixels;
     const int i_src_pitch_u = p_inpic->p[U_PLANE].i_pitch;
-    const int i_src_visible_u = p_inpic->p[U_PLANE].i_visible_pitch;
     const int i_num_lines_u = p_inpic->p[U_PLANE].i_visible_lines;
 
     uint8_t *p_oldpix;
@@ -162,19 +152,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     }
 
     p_outpix = p_outpic->p[Y_PLANE].p_pixels;
-#if 0
-    p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
-        p_inpic->p[U_PLANE].i_pitch * p_inpic->p[U_PLANE].i_visible_lines );
-    p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
-        p_inpic->p[V_PLANE].i_pitch * p_inpic->p[V_PLANE].i_visible_lines );
-#else
-    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 );
-#endif
 
     if( !p_sys->p_oldpix || !p_sys->p_buf )
     {
@@ -231,7 +212,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
             msg_Warn( p_filter, "Not taking chroma into account" );
             break;
     }
-    format = 0;
+
+    //format = 0;
     if( format )
     {
         for( line = 0; line < i_num_lines_u; line++ )
@@ -248,6 +230,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
                 {
                     diff = p_oldpix_u[i] - p_inpix_u[i];
                 }
+                if( p_inpix_v[i] > p_oldpix_v[i] )
+                {
+                    diff += p_inpix_v[i] - p_oldpix_v[i];
+                }
+                else
+                {
+                    diff += p_oldpix_v[i] - p_inpix_v[i];
+                }
                 switch( format )
                 {
                     case 1:
@@ -257,7 +247,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
                         p_buf2[(2*line+1)*i_src_pitch+2*col+1] += diff;
                         break;
 
-                    case2:
+                    case 2:
                         p_buf2[line*i_src_pitch+2*col] += diff;
                         p_buf2[line*i_src_pitch+2*col+1] += diff;
                         break;
@@ -269,31 +259,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
     /**
      * Apply some smoothing to remove noise
      */
-#if 1
     GaussianConvolution( p_buf2, p_buf, i_src_pitch, i_num_lines, i_src_visible );
 
-#else
-    uint32_t *pouet = p_buf2;
-    p_buf2 = p_buf;
-    p_buf = pouet;
-#endif
     /**
      * Copy luminance plane
      */
     for( i = 0; i < i_src_pitch * i_num_lines; i++ )
     {
-        /*if( p_buf[i] > 25 )
-        {
-            //p_outpix[i] = 255;
-        }
-        else// if( p_buf[i] > 15 )*/
-        {
-            p_outpix[i] = p_inpix[i];
-        }
-        /*else
-        {
-            p_outpix[i] = 0;
-        }*/
+        p_outpix[i] = p_inpix[i];
     }
 
     /**
@@ -373,7 +346,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
         {
             while( colors[p_buf[i]] != p_buf[i] )
                 p_buf[i] = colors[p_buf[i]];
-            //p_outpix[i] = /*(p_buf[i]%2) */ 0xff;
             if( color_x_min[p_buf[i]] == -1 )
             {
                 color_x_min[p_buf[i]] =
@@ -407,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;
             }
@@ -433,7 +404,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
             if( ( color_y_max[i] - color_y_min[i] ) * ( color_x_max[i] - color_x_min[i] ) < 16 ) continue;
             j++;
             int x, y;
-#if 1
             y = color_y_min[i];
             for( x = color_x_min[i]; x <= color_x_max[i]; x++ )
             {
@@ -454,29 +424,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic )
             {
                 p_outpix[y*i_src_pitch+x] = 0xff;
             }
-#else
-            for( x = color_x_min[i]; x <= color_x_max[i]; x++ )
-            {
-                for( y = color_y_min[i]; y <= color_y_max[i]; y++ )
-                {
-                    p_outpix[y*i_src_pitch+x] = 0x0;
-                        //p_inpix[y*i_src_pitch+x];
-                }
-            }
-#endif
         }
     }
-    printf("counted %d moving shapes\n", j);
+    msg_Dbg( p_filter, "Counted %d moving shapes.", j);
 
     /**
-     * We're done. Lets keep a copy of the Y plane
+     * 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 );