Fix rtmp access_output building

[vlc] / modules / video_filter / colorthres.c

diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c
index e7e2751a28c38a24819280e7cc75960fe4a57c58..c01496a5e9e6d891afc51c80ad218e31ee4fc909 100644 (file)
--- a/modules/video_filter/colorthres.c
+++ b/modules/video_filter/colorthres.c
@@ -25,11 +25,14 @@
  * Preamble
  *****************************************************************************/
 #include <errno.h>
-#include <stdlib.h>                                      /* malloc(), free() */
-#include <string.h>
 #include <math.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>
 
@@ -57,23 +60,28 @@ static int pi_color_values[] = {
 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") );
-    set_shortname( _("Color threshold" ));
+    set_description( N_("Color threshold filter") );
+    set_shortname( N_("Color threshold" ));
     set_category( CAT_VIDEO );
     set_subcategory( SUBCAT_VIDEO_VFILTER );
     set_capability( "video filter2", 0 );
-    add_integer( "colorthres-color", 0x00FF0000, NULL, COLOR_TEXT,
-                 COLOR_LONGTEXT, VLC_FALSE );
+    add_integer( CFG_PREFIX "color", 0x00FF0000, NULL, COLOR_TEXT,
+                 COLOR_LONGTEXT, 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"), "", false );
+    add_integer( CFG_PREFIX "similaritythres", 15, NULL,
+                 _("Similarity threshold"), "", 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
  *****************************************************************************/
@@ -91,7 +99,13 @@ static int Create( vlc_object_t *p_this )
     filter_t *p_filter = (filter_t *)p_this;
 
     /* XXX: we might need to add/remove some FOURCCs ... */
-    if(   p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') )
+    if(   p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2')
+
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2')
+       && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2') )
     {
         msg_Err( p_filter, "Unsupported input chroma (%4s)",
                  (char*)&(p_filter->fmt_in.video.i_chroma) );
@@ -104,9 +118,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 +186,11 @@ 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 */
-    p_filter->p_libvlc->
-    pf_memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines
+    vlc_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
+    vlc_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
+    vlc_memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines
                * p_pic->p[U_PLANE].i_pitch - 8 );
 
     /*