/*****************************************************************************
* 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_VFILTER2 );
+ 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;
+ uint8_t *p_buf8;
/* For hough mode */
int *p_pre_hough;
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;
p_filter->p_sys->p_pre_hough = NULL;
- sout_CfgParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
+ 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;
+ p_filter->p_sys->p_buf8 = NULL;
return VLC_SUCCESS;
}
{
filter_t *p_filter = (filter_t *)p_this;
- if(p_filter->p_sys->p_pre_hough)
- free(p_filter->p_sys->p_pre_hough);
+ free( p_filter->p_sys->p_buf32 );
+ free( p_filter->p_sys->p_buf32_bis );
+ free( p_filter->p_sys->p_buf8 );
+ free( p_filter->p_sys->p_pre_hough );
free( p_filter->p_sys );
}
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
*****************************************************************************
*****************************************************************************/
static void GaussianConvolution( picture_t *p_inpic, uint32_t *p_smooth )
{
- uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels;
- int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch;
- int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch;
- int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines;
+ const uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels;
+ const int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch;
+ const int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch;
+ const int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines;
int x,y;
for( y = 2; y < i_num_lines - 2; y++ )
{
p_smooth[y*i_src_visible+x] = (uint32_t)(
/* 2 rows up */
- ( p_inpix[(y-2)*i_src_pitch+x-2]<<1 )
- + ( p_inpix[(y-2)*i_src_pitch+x-1]<<2 )
- + ( p_inpix[(y-2)*i_src_pitch+x]<<2 )
- + ( p_inpix[(y-2)*i_src_pitch+x+1]<<2 )
- + ( p_inpix[(y-2)*i_src_pitch+x+2]<<1 )
+ ( p_inpix[(y-2)*i_src_pitch+x-2] )
+ + ((p_inpix[(y-2)*i_src_pitch+x-1]
+ + p_inpix[(y-2)*i_src_pitch+x]
+ + p_inpix[(y-2)*i_src_pitch+x+1])<<1 )
+ + ( p_inpix[(y-2)*i_src_pitch+x+2] )
/* 1 row up */
- + ( p_inpix[(y-1)*i_src_pitch+x-2]<<2 )
- + ( p_inpix[(y-1)*i_src_pitch+x-1]<<3 )
- + ( p_inpix[(y-1)*i_src_pitch+x]*12 )
- + ( p_inpix[(y-1)*i_src_pitch+x+1]<<3 )
- + ( p_inpix[(y-1)*i_src_pitch+x+2]<<2 )
+ + ((p_inpix[(y-1)*i_src_pitch+x-2]
+ + ( p_inpix[(y-1)*i_src_pitch+x-1]<<1 )
+ + ( p_inpix[(y-1)*i_src_pitch+x]*3 )
+ + ( p_inpix[(y-1)*i_src_pitch+x+1]<<1 )
+ + p_inpix[(y-1)*i_src_pitch+x+2]
/* */
- + ( p_inpix[y*i_src_pitch+x-2]<<2 )
- + ( p_inpix[y*i_src_pitch+x-1]*12 )
- + ( p_inpix[y*i_src_pitch+x]<<4 )
- + ( p_inpix[y*i_src_pitch+x+1]*12 )
- + ( p_inpix[y*i_src_pitch+x+2]<<2 )
+ + p_inpix[y*i_src_pitch+x-2]
+ + ( p_inpix[y*i_src_pitch+x-1]*3 )
+ + ( p_inpix[y*i_src_pitch+x]<<2 )
+ + ( p_inpix[y*i_src_pitch+x+1]*3 )
+ + p_inpix[y*i_src_pitch+x+2]
/* 1 row down */
- + ( p_inpix[(y+1)*i_src_pitch+x-2]<<2 )
- + ( p_inpix[(y+1)*i_src_pitch+x-1]<<3 )
- + ( p_inpix[(y+1)*i_src_pitch+x]*12 )
- + ( p_inpix[(y+1)*i_src_pitch+x+1]<<3 )
- + ( p_inpix[(y+1)*i_src_pitch+x+2]<<2 )
+ + p_inpix[(y+1)*i_src_pitch+x-2]
+ + ( p_inpix[(y+1)*i_src_pitch+x-1]<<1 )
+ + ( p_inpix[(y+1)*i_src_pitch+x]*3 )
+ + ( p_inpix[(y+1)*i_src_pitch+x+1]<<1 )
+ + p_inpix[(y+1)*i_src_pitch+x+2] )<<1 )
/* 2 rows down */
- + ( p_inpix[(y+2)*i_src_pitch+x-2]<<1 )
- + ( p_inpix[(y+2)*i_src_pitch+x-1]<<2 )
- + ( p_inpix[(y+2)*i_src_pitch+x]<<2 )
- + ( p_inpix[(y+2)*i_src_pitch+x+1]<<2 )
- + ( p_inpix[(y+2)*i_src_pitch+x+2]<<1 )
- ) >> 7 /* 115 */;
+ + ( p_inpix[(y+2)*i_src_pitch+x-2] )
+ + ((p_inpix[(y+2)*i_src_pitch+x-1]
+ + p_inpix[(y+2)*i_src_pitch+x]
+ + p_inpix[(y+2)*i_src_pitch+x+1])<<1 )
+ + ( p_inpix[(y+2)*i_src_pitch+x+2] )
+ ) >> 6 /* 115 */;
}
}
}
picture_t *p_outpic )
{
int x, y;
- int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch;
- int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch;
- int i_dst_pitch = p_outpic->p[Y_PLANE].i_pitch;
- int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines;
+ const int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch;
+ const int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch;
+ const int i_dst_pitch = p_outpic->p[Y_PLANE].i_pitch;
+ const int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines;
- uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels;
+ const uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels;
uint8_t *p_outpix = p_outpic->p[Y_PLANE].p_pixels;
- uint32_t *p_smooth = (uint32_t *)malloc( i_num_lines * i_src_visible * sizeof(uint32_t));
+ uint32_t *p_smooth;
+ if( !p_filter->p_sys->p_buf32 )
+ p_filter->p_sys->p_buf32 =
+ (uint32_t *)malloc( i_num_lines * i_src_visible * sizeof(uint32_t));
+ p_smooth = p_filter->p_sys->p_buf32;
if( !p_smooth ) return;
if( p_filter->p_sys->b_cartoon )
{
- p_filter->p_vlc->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_vlc->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_vlc->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_vlc->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 );
}
| -2 0 2 | and | 0 0 0 |
| -1 0 1 | | -1 -2 -1 | */
- for( y = 1; y < i_num_lines - 1; y++ )
+#define FOR \
+ for( y = 1; y < i_num_lines - 1; y++ ) \
+ { \
+ for( x = 1; x < i_src_visible - 1; x++ ) \
+ { \
+ const uint32_t a = \
+ ( \
+ abs( \
+ ( p_smooth[(y-1)*i_src_visible+x-1] \
+ - p_smooth[(y+1)*i_src_visible+x-1] ) \
+ + ( ( p_smooth[(y-1)*i_src_visible+x] \
+ - p_smooth[(y+1)*i_src_visible+x] ) <<1 ) \
+ + ( p_smooth[(y-1)*i_src_visible+x+1] \
+ - p_smooth[(y+1)*i_src_visible+x+1] ) \
+ ) \
+ + \
+ abs( \
+ ( p_smooth[(y-1)*i_src_visible+x-1] \
+ - p_smooth[(y-1)*i_src_visible+x+1] ) \
+ + ( ( p_smooth[y*i_src_visible+x-1] \
+ - p_smooth[y*i_src_visible+x+1] ) <<1 ) \
+ + ( p_smooth[(y+1)*i_src_visible+x-1] \
+ - p_smooth[(y+1)*i_src_visible+x+1] ) \
+ ) \
+ );
+ if( p_filter->p_sys->i_gradient_type )
{
- for( x = 1; x < i_src_visible - 1; x++ )
+ if( p_filter->p_sys->b_cartoon )
{
- uint32_t a =
- (
- abs(
- ( ( p_smooth[(y-1)*i_src_visible+x]
- - p_smooth[(y+1)*i_src_visible+x] ) <<1 )
- + ( p_smooth[(y-1)*i_src_visible+x-1]
- - p_smooth[(y+1)*i_src_visible+x-1] )
- + ( p_smooth[(y-1)*i_src_visible+x+1]
- - p_smooth[(y+1)*i_src_visible+x+1] )
- )
- +
- abs(
- ( ( p_smooth[y*i_src_visible+x-1]
- - p_smooth[y*i_src_visible+x+1] ) <<1 )
- + ( p_smooth[(y-1)*i_src_visible+x-1]
- - p_smooth[(y-1)*i_src_visible+x+1] )
- + ( p_smooth[(y+1)*i_src_visible+x-1]
- - p_smooth[(y+1)*i_src_visible+x+1] )
- )
- );
- if( p_filter->p_sys->i_gradient_type )
+ FOR
+ if( a > 60 )
{
- if( p_filter->p_sys->b_cartoon )
- {
- if( a > 60 )
- {
- p_outpix[y*i_dst_pitch+x] = 0x00;
- }
- else
- {
- if( p_smooth[y*i_src_visible+x] > 0xa0 )
- p_outpix[y*i_dst_pitch+x] =
- 0xff - ((0xff - p_inpix[y*i_src_pitch+x] )>>2);
- else if( p_smooth[y*i_src_visible+x] > 0x70 )
- p_outpix[y*i_dst_pitch+x] =
- 0xa0 - ((0xa0 - p_inpix[y*i_src_pitch+x] )>>2);
- else if( p_smooth[y*i_src_visible+x] > 0x28 )
- p_outpix[y*i_dst_pitch+x] =
- 0x70 - ((0x70 - p_inpix[y*i_src_pitch+x] )>>2);
- else
- p_outpix[y*i_dst_pitch+x] =
- 0x28 - ((0x28 - p_inpix[y*i_src_pitch+x] )>>2);
- }
- }
- else
- {
- 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] = 0x00;
}
else
{
- if( a>>8 )
- p_outpix[y*i_dst_pitch+x] = 0;
+ if( p_smooth[y*i_src_visible+x] > 0xa0 )
+ p_outpix[y*i_dst_pitch+x] =
+ 0xff - ((0xff - p_inpix[y*i_src_pitch+x] )>>2);
+ else if( p_smooth[y*i_src_visible+x] > 0x70 )
+ p_outpix[y*i_dst_pitch+x] =
+ 0xa0 - ((0xa0 - p_inpix[y*i_src_pitch+x] )>>2);
+ else if( p_smooth[y*i_src_visible+x] > 0x28 )
+ p_outpix[y*i_dst_pitch+x] =
+ 0x70 - ((0x70 - p_inpix[y*i_src_pitch+x] )>>2);
else
- p_outpix[y*i_dst_pitch+x] = (uint8_t)(255 - a);
+ p_outpix[y*i_dst_pitch+x] =
+ 0x28 - ((0x28 - p_inpix[y*i_src_pitch+x] )>>2);
}
+ }}
+ }
+ else
+ {
+ FOR
+ p_outpix[y*i_dst_pitch+x] = clip_uint8_vlc( a );
+ }}
}
}
-
- if( p_smooth ) free( p_smooth );
+ else
+ {
+ FOR
+ if( a>>8 )
+ p_outpix[y*i_dst_pitch+x] = 0;
+ else
+ p_outpix[y*i_dst_pitch+x] = 0xff-(uint8_t)a;
+ }}
+ }
+#undef FOR
}
/*****************************************************************************
{
int x, y;
- int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch;
- int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch;
- int i_dst_pitch = p_outpic->p[Y_PLANE].i_pitch;
- int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines;
+ const int i_src_pitch = p_inpic->p[Y_PLANE].i_pitch;
+ const int i_src_visible = p_inpic->p[Y_PLANE].i_visible_pitch;
+ const int i_dst_pitch = p_outpic->p[Y_PLANE].i_pitch;
+ const int i_num_lines = p_inpic->p[Y_PLANE].i_visible_lines;
- uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels;
+ const uint8_t *p_inpix = p_inpic->p[Y_PLANE].p_pixels;
uint8_t *p_outpix = p_outpic->p[Y_PLANE].p_pixels;
- uint32_t *p_smooth = malloc( i_num_lines*i_src_visible * sizeof(uint32_t) );
- uint32_t *p_grad = malloc( i_num_lines*i_src_visible *sizeof(uint32_t) );
- uint8_t *p_theta = malloc( i_num_lines*i_src_visible *sizeof(uint8_t) );
+ uint32_t *p_smooth;
+ uint32_t *p_grad;
+ uint8_t *p_theta;
+
+ if( !p_filter->p_sys->p_buf32 )
+ p_filter->p_sys->p_buf32 =
+ (uint32_t *)malloc( i_num_lines * i_src_visible * sizeof(uint32_t));
+ p_smooth = p_filter->p_sys->p_buf32;
+
+ if( !p_filter->p_sys->p_buf32_bis )
+ p_filter->p_sys->p_buf32_bis =
+ (uint32_t *)malloc( i_num_lines * i_src_visible * sizeof(uint32_t));
+ p_grad = p_filter->p_sys->p_buf32_bis;
+
+ if( !p_filter->p_sys->p_buf8 )
+ p_filter->p_sys->p_buf8 =
+ (uint8_t *)malloc( i_num_lines * i_src_visible * sizeof(uint8_t));
+ p_theta = p_filter->p_sys->p_buf8;
if( !p_smooth || !p_grad || !p_theta ) return;
if( p_filter->p_sys->b_cartoon )
{
- p_filter->p_vlc->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_vlc->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_vlc->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_vlc->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 );
}
for( x = 1; x < i_src_visible - 1; x++ )
{
- int gradx =
- ( ( p_smooth[(y-1)*i_src_visible+x]
- - p_smooth[(y+1)*i_src_visible+x] ) <<1 )
- + ( p_smooth[(y-1)*i_src_visible+x-1]
+ const int gradx =
+ ( p_smooth[(y-1)*i_src_visible+x-1]
- p_smooth[(y+1)*i_src_visible+x-1] )
+ + ( ( p_smooth[(y-1)*i_src_visible+x]
+ - p_smooth[(y+1)*i_src_visible+x] ) <<1 )
+ ( p_smooth[(y-1)*i_src_visible+x+1]
- p_smooth[(y+1)*i_src_visible+x+1] );
- int grady =
- ( ( p_smooth[y*i_src_visible+x-1]
- - p_smooth[y*i_src_visible+x+1] ) <<1 )
- + ( p_smooth[(y-1)*i_src_visible+x-1]
+ const int grady =
+ ( p_smooth[(y-1)*i_src_visible+x-1]
- p_smooth[(y-1)*i_src_visible+x+1] )
+ + ( ( p_smooth[y*i_src_visible+x-1]
+ - p_smooth[y*i_src_visible+x+1] ) <<1 )
+ ( p_smooth[(y+1)*i_src_visible+x-1]
- p_smooth[(y+1)*i_src_visible+x+1] );
&& p_grad[y*i_src_visible+x] > p_grad[(y+1)*i_src_visible+x] )
{
p_outpix[y*i_dst_pitch+x] = 0;
+ break;
} else goto colorize;
- break;
case THETA_P:
if( p_grad[y*i_src_visible+x] > p_grad[(y-1)*i_src_visible+x-1]
&& p_grad[y*i_src_visible+x] > p_grad[(y+1)*i_src_visible+x+1] )
{
p_outpix[y*i_dst_pitch+x] = 0;
+ break;
} else goto colorize;
- break;
case THETA_M:
if( p_grad[y*i_src_visible+x] > p_grad[(y-1)*i_src_visible+x+1]
&& p_grad[y*i_src_visible+x] > p_grad[(y+1)*i_src_visible+x-1] )
{
p_outpix[y*i_dst_pitch+x] = 0;
+ break;
} else goto colorize;
- break;
case THETA_X:
if( p_grad[y*i_src_visible+x] > p_grad[y*i_src_visible+x-1]
&& p_grad[y*i_src_visible+x] > p_grad[y*i_src_visible+x+1] )
{
p_outpix[y*i_dst_pitch+x] = 0;
+ break;
} else goto colorize;
- break;
}
}
else
}
}
}
- if( p_smooth ) free( p_smooth );
- if( p_grad ) free( p_grad );
- if( p_theta) free( p_theta );
}
/*****************************************************************************
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_vlc->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_vlc->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_vlc->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