/*****************************************************************************
* gradient.c : Gradient and edge detection video effects plugin for vlc
*****************************************************************************
- * Copyright (C) 2000-2006 the VideoLAN team
+ * Copyright (C) 2000-2008 the VideoLAN team
* $Id$
*
* Authors: Samuel Hocevar <sam@zoy.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <math.h> /* sin(), cos() */
-#include <vlc/vlc.h>
-#include <vlc/sout.h>
-#include <vlc/decoder.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
+#include <vlc_vout.h>
#include "vlc_filter.h"
+#include "filter_picture.h"
enum { GRADIENT, EDGE, HOUGH };
static void Destroy ( vlc_object_t * );
static picture_t *Filter( filter_t *, picture_t * );
+static int GradientCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t,
+ void * );
static void FilterGradient( filter_t *, picture_t *, picture_t * );
static void FilterEdge ( filter_t *, picture_t *, picture_t * );
#define CARTOON_LONGTEXT N_("Apply cartoon effect. It is only used by " \
"\"gradient\" and \"edge\".")
-static char *mode_list[] = { "gradient", "edge", "hough" };
-static char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") };
+static const char *const mode_list[] = { "gradient", "edge", "hough" };
+static const char *const mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") };
#define FILTER_PREFIX "gradient-"
vlc_module_begin();
- set_description( _("Gradient video filter") );
+ set_description( N_("Gradient video filter") );
set_shortname( N_( "Gradient" ));
set_capability( "video filter2", 0 );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
add_string( FILTER_PREFIX "mode", "gradient", NULL,
- MODE_TEXT, MODE_LONGTEXT, VLC_FALSE );
+ MODE_TEXT, MODE_LONGTEXT, false );
change_string_list( mode_list, mode_list_text, 0 );
add_integer_with_range( FILTER_PREFIX "type", 0, 0, 1, NULL,
- GRADIENT_TEXT, GRADIENT_LONGTEXT, VLC_FALSE );
+ GRADIENT_TEXT, GRADIENT_LONGTEXT, false );
add_bool( FILTER_PREFIX "cartoon", 1, NULL,
- CARTOON_TEXT, CARTOON_LONGTEXT, VLC_FALSE );
+ CARTOON_TEXT, CARTOON_LONGTEXT, false );
add_shortcut( "gradient" );
set_callbacks( Create, Destroy );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"mode", "type", "cartoon", NULL
};
/* For the gradient mode */
int i_gradient_type;
- vlc_bool_t b_cartoon;
+ bool b_cartoon;
uint32_t *p_buf32;
uint32_t *p_buf32_bis;
filter_t *p_filter = (filter_t *)p_this;
char *psz_method;
+ switch( p_filter->fmt_in.video.i_chroma )
+ {
+ CASE_PLANAR_YUV
+ break;
+
+ default:
+ msg_Err( p_filter, "Unsupported input chroma (%4s)",
+ (char*)&(p_filter->fmt_in.video.i_chroma) );
+ return VLC_EGENERIC;
+ }
+
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_filter->pf_video_filter = Filter;
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
- var_Create( p_filter, FILTER_PREFIX "mode",
- VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_filter, FILTER_PREFIX "type",
- VLC_VAR_STRING | VLC_VAR_DOINHERIT );
- var_Create( p_filter, FILTER_PREFIX "cartoon",
- VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
-
- if( !(psz_method = var_GetString( p_filter, FILTER_PREFIX "mode" )) )
+ if( !(psz_method =
+ var_CreateGetNonEmptyStringCommand( p_filter, FILTER_PREFIX "mode" )) )
{
msg_Err( p_filter, "configuration variable "
FILTER_PREFIX "mode empty" );
}
else
{
- msg_Err( p_filter, "no valid gradient mode provided" );
+ msg_Err( p_filter, "no valid gradient mode provided (%s)", psz_method );
p_filter->p_sys->i_mode = GRADIENT;
}
}
free( psz_method );
p_filter->p_sys->i_gradient_type =
- var_GetInteger( p_filter, FILTER_PREFIX "type" );
+ var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "type" );
p_filter->p_sys->b_cartoon =
- var_GetInteger( p_filter, FILTER_PREFIX "cartoon" );
+ var_CreateGetBoolCommand( p_filter, FILTER_PREFIX "cartoon" );
+
+ var_AddCallback( p_filter, FILTER_PREFIX "mode",
+ GradientCallback, p_filter->p_sys );
+ var_AddCallback( p_filter, FILTER_PREFIX "type",
+ GradientCallback, p_filter->p_sys );
+ var_AddCallback( p_filter, FILTER_PREFIX "cartoon",
+ GradientCallback, p_filter->p_sys );
p_filter->p_sys->p_buf32 = NULL;
p_filter->p_sys->p_buf32_bis = NULL;
if( !p_pic ) return NULL;
- p_outpic = p_filter->pf_vout_buffer_new( p_filter );
+ p_outpic = filter_NewPicture( p_filter );
if( !p_outpic )
{
- msg_Warn( p_filter, "can't get output picture" );
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
+ picture_Release( p_pic );
return NULL;
}
break;
}
- p_outpic->date = p_pic->date;
- p_outpic->b_force = p_pic->b_force;
- p_outpic->i_nb_fields = p_pic->i_nb_fields;
- p_outpic->b_progressive = p_pic->b_progressive;
- p_outpic->b_top_field_first = p_pic->b_top_field_first;
-
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
-
- return p_outpic;
+ return CopyInfoAndRelease( p_outpic, p_pic );
}
-
/*****************************************************************************
* Gaussian Convolution
*****************************************************************************
if( p_filter->p_sys->b_cartoon )
{
- p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
+ vlc_memcpy( p_outpic->p[U_PLANE].p_pixels,
p_inpic->p[U_PLANE].p_pixels,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
+ vlc_memcpy( p_outpic->p[V_PLANE].p_pixels,
p_inpic->p[V_PLANE].p_pixels,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
else
{
- p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
+ vlc_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
+ vlc_memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
else
{
FOR
- if( a>>8 )
- p_outpix[y*i_dst_pitch+x] = 255;
- else
- p_outpix[y*i_dst_pitch+x] = (uint8_t)a;
+ p_outpix[y*i_dst_pitch+x] = clip_uint8_vlc( a );
}}
}
}
if( p_filter->p_sys->b_cartoon )
{
- p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels,
+ vlc_memcpy( p_outpic->p[U_PLANE].p_pixels,
p_inpic->p[U_PLANE].p_pixels,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels,
+ vlc_memcpy( p_outpic->p[V_PLANE].p_pixels,
p_inpic->p[V_PLANE].p_pixels,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
else
{
- p_filter->p_libvlc->pf_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff,
+ vlc_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff,
p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
- p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
+ vlc_memset( p_outpic->p[U_PLANE].p_pixels, 0x80,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
+ vlc_memset( p_outpic->p[V_PLANE].p_pixels, 0x80,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
msg_Dbg(p_filter, "Precalculation done");
}
- memset( p_hough, 0, i_diag * i_nb_steps * sizeof(int) );
+ vlc_memset( p_hough, 0, i_diag * i_nb_steps * sizeof(int) );
- p_filter->p_libvlc->pf_memcpy(
+ vlc_memcpy(
p_outpic->p[Y_PLANE].p_pixels, p_inpic->p[Y_PLANE].p_pixels,
p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch );
- p_filter->p_libvlc->pf_memcpy(
+ vlc_memcpy(
p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels,
p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch );
- p_filter->p_libvlc->pf_memcpy(
+ vlc_memcpy(
p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels,
p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch );
}
}
- if( p_hough ) free( p_hough );
- if( p_smooth ) free( p_smooth );
+ free( p_hough );
+ free( p_smooth );
}
#undef p_pre_hough
+
+
+static int GradientCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval,
+ void *p_data )
+{
+ VLC_UNUSED(oldval);
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+ if( !strcmp( psz_var, FILTER_PREFIX "mode" ) )
+ {
+ if( !strcmp( newval.psz_string, "gradient" ) )
+ {
+ p_sys->i_mode = GRADIENT;
+ }
+ else if( !strcmp( newval.psz_string, "edge" ) )
+ {
+ p_sys->i_mode = EDGE;
+ }
+ else if( !strcmp( newval.psz_string, "hough" ) )
+ {
+ p_sys->i_mode = HOUGH;
+ }
+ else
+ {
+ msg_Err( p_this, "no valid gradient mode provided (%s)", newval.psz_string );
+ p_sys->i_mode = GRADIENT;
+ }
+ }
+ else if( !strcmp( psz_var, FILTER_PREFIX "type" ) )
+ {
+ p_sys->i_gradient_type = newval.i_int;
+ }
+ else if( !strcmp( psz_var, FILTER_PREFIX "cartoon" ) )
+ {
+ p_sys->b_cartoon = newval.b_bool;
+ }
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff