X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fgradient.c;h=994734389fbc040c5ef8032ecbf5f6be2bb292e5;hb=3f3025aa794fbdad01150af9401bcb708263488f;hp=97ce1aabf54fee51294db6435207cc77adfc3a7c;hpb=1fa3f9dd6e748b80c83a4b358c6b262e62494cdb;p=vlc diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index 97ce1aabf5..994734389f 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -31,8 +31,8 @@ #include /* sin(), cos() */ #include -#include -#include +#include +#include #include "vlc_filter.h" @@ -45,6 +45,9 @@ static int Create ( vlc_object_t * ); 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 * ); @@ -64,14 +67,14 @@ static void FilterHough ( 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 *mode_list[] = { "gradient", "edge", "hough" }; +static const char *mode_list_text[] = { N_("Gradient"), N_("Edge"), N_("Hough") }; #define FILTER_PREFIX "gradient-" vlc_module_begin(); set_description( _("Gradient video filter") ); - set_shortname( N_( "Gradient" )); + set_shortname( _( "Gradient" )); set_capability( "video filter2", 0 ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_VFILTER ); @@ -137,17 +140,11 @@ static int Create( vlc_object_t *p_this ) 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" ); @@ -176,9 +173,16 @@ static int Create( vlc_object_t *p_this ) 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; @@ -256,7 +260,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) return p_outpic; } - /***************************************************************************** * Gaussian Convolution ***************************************************************************** @@ -341,18 +344,18 @@ static void FilterGradient( filter_t *p_filter, picture_t *p_inpic, if( p_filter->p_sys->b_cartoon ) { - p_filter->p_vlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); } @@ -418,10 +421,7 @@ static void FilterGradient( filter_t *p_filter, picture_t *p_inpic, 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 ); }} } } @@ -488,20 +488,20 @@ static void FilterEdge( filter_t *p_filter, picture_t *p_inpic, if( p_filter->p_sys->b_cartoon ) { - p_filter->p_vlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_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, + p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); } @@ -658,15 +658,16 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, msg_Dbg(p_filter, "Precalculation done"); } - memset( p_hough, 0, i_diag * i_nb_steps * sizeof(int) ); + p_filter->p_libvlc->pf_memset( p_hough, 0, + i_diag * i_nb_steps * sizeof(int) ); - p_filter->p_vlc->pf_memcpy( + p_filter->p_libvlc->pf_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( + p_filter->p_libvlc->pf_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_filter->p_libvlc->pf_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 ); @@ -737,3 +738,40 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, if( p_smooth ) 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 ) +{ + 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" ); + 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; +}