Removes trailing spaces. Removes tabs.

[vlc] / modules / video_filter / colorthres.c

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index d81bce0ef6778a53eb4af5913feb1fd33083b8d3..8ee41f9b1a6ba82e991155f035e4d6d53f90f180 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -25,13 +25,11 @@
  * Preamble
  *****************************************************************************/
 #include <errno.h>
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 #include <math.h>
 
 #include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include <vlc/decoder.h>
+#include <vlc_sout.h>
+#include <vlc_vout.h>
 
 #include "vlc_filter.h"
 
@@ -52,11 +50,12 @@ static picture_t *Filter( filter_t *, picture_t * );
     "chars are for red, then green, then blue. #000000 = black, #FF0000 = red,"\
     " #00FF00 = green, #FFFF00 = yellow (red + green), #FFFFFF = white" )
 static int pi_color_values[] = {
-  0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x0000FF00, 0x000000FF, 0x0000FFFF }; 
+  0x00FF0000, 0x00FF00FF, 0x00FFFF00, 0x0000FF00, 0x000000FF, 0x0000FFFF };
 
-static char *ppsz_color_descriptions[] = {
+static const char *ppsz_color_descriptions[] = {
   N_("Red"), N_("Fuchsia"), N_("Yellow"), N_("Lime"), N_("Blue"), N_("Aqua") };
 
+#define CFG_PREFIX "colorthres-"
 
 vlc_module_begin();
     set_description( _("Color threshold filter") );
@@ -64,16 +63,20 @@ vlc_module_begin();
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
-    add_integer( "colorthres-color", 0x00FF0000, NULL, COLOR_TEXT,
+    add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
                  COLOR_LONGTEXT, VLC_FALSE );
         change_integer_list( pi_color_values, ppsz_color_descriptions, 0 );
-    add_integer( "colorthres-saturationthres", 20, NULL, "saturaton threshold",
-                 "", VLC_FALSE );
-    add_integer( "colorthres-similaritythres", 15, NULL, "similarity threshold",
-                 "", VLC_FALSE );
+    add_integer( CFG_PREFIX "saturationthres", 20, NULL,
+                 _("Saturaton threshold"), "", VLC_FALSE );
+    add_integer( CFG_PREFIX "similaritythres", 15, NULL,
+                 _("Similarity threshold"), "", VLC_FALSE );
     set_callbacks( Create, Destroy );
 vlc_module_end();
 
+static const char *ppsz_filter_options[] = {
+    "color", "saturationthes", "similaritythres", NULL
+};
+
 /*****************************************************************************
  * filter_sys_t: adjust filter method descriptor
  *****************************************************************************/
@@ -104,9 +107,12 @@ static int Create( vlc_object_t *p_this )
         return VLC_EGENERIC;
     }
 
-    var_Create( p_filter, "colorthres-color", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-    var_Create( p_filter, "colorthres-similaritythres", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
-    var_Create( p_filter, "colorthres-saturationthres", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
+    config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
+                       p_filter->p_cfg );
+    var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "color" );
+    var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "similaritythres" );
+    var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "saturationthres" );
+
     /* Allocate structure */
     p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
     if( p_filter->p_sys == NULL )
@@ -169,14 +175,16 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
     p_out_v = p_outpic->p[V_PLANE].p_pixels;
 
     /* Create grayscale version of input */
-    memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines
-            * p_pic->p[Y_PLANE].i_pitch - 8 );
-    memset( p_out_u, 0x80, p_pic->p[U_PLANE].i_visible_lines
-            * p_pic->p[U_PLANE].i_pitch - 8 );
-    memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines
-            * p_pic->p[U_PLANE].i_pitch - 8 );
-
-   
+    p_filter->p_libvlc->
+    pf_memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines
+               * p_pic->p[Y_PLANE].i_pitch - 8 );
+    p_filter->p_libvlc->
+    pf_memset( p_out_u, 0x80, p_pic->p[U_PLANE].i_visible_lines
+               * p_pic->p[U_PLANE].i_pitch - 8 );
+    p_filter->p_libvlc->
+    pf_memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines
+               * p_pic->p[U_PLANE].i_pitch - 8 );
+
     /*
      * Do the U and V planes
      */
@@ -212,8 +220,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
         p_in_v++;
         p_out_u++;
         p_out_v++;
-            
-        
     }
 
     p_outpic->date = p_pic->date;