X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fgradient.c;h=0c3d5158372eaa04d85b6c4204eb8aac65fb2ba9;hb=e9ea6c7bbf89af396642c954dae7e4528788aef8;hp=56095aa05dfb67418dfaee76d08d87e9c4baf3ca;hpb=212dce0e5063359ef5f6505d12617c6993474258;p=vlc diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index 56095aa05d..0c3d515837 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -1,40 +1,43 @@ /***************************************************************************** * gradient.c : Gradient and edge detection video effects plugin for vlc ***************************************************************************** - * Copyright (C) 2000-2006 the VideoLAN team + * Copyright (C) 2000-2008 VLC authors and VideoLAN * $Id$ * * Authors: Samuel Hocevar * Antoine Cellerier * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include /* sin(), cos() */ -#include -#include -#include +#include +#include +#include -#include "vlc_filter.h" +#include +#include "filter_picture.h" enum { GRADIENT, EDGE, HOUGH }; @@ -45,6 +48,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,48 +70,52 @@ 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") }; +#define GRADIENT_HELP N_("Apply color gradient or edge detection effects") + +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_shortname( _( "Gradient" )); - set_capability( "video filter2", 0 ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); +vlc_module_begin () + set_description( N_("Gradient video filter") ) + set_shortname( N_( "Gradient" )) + set_help(GRADIENT_HELP) + 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 ); - change_string_list( mode_list, mode_list_text, 0 ); + add_string( FILTER_PREFIX "mode", "gradient", + MODE_TEXT, MODE_LONGTEXT, false ) + change_string_list( mode_list, mode_list_text ) - add_integer_with_range( FILTER_PREFIX "type", 0, 0, 1, NULL, - GRADIENT_TEXT, GRADIENT_LONGTEXT, VLC_FALSE ); - add_bool( FILTER_PREFIX "cartoon", 1, NULL, - CARTOON_TEXT, CARTOON_LONGTEXT, VLC_FALSE ); + add_integer_with_range( FILTER_PREFIX "type", 0, 0, 1, + GRADIENT_TEXT, GRADIENT_LONGTEXT, false ) + add_bool( FILTER_PREFIX "cartoon", true, + CARTOON_TEXT, CARTOON_LONGTEXT, false ) - add_shortcut( "gradient" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + 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 }; /***************************************************************************** - * vout_sys_t: Distort video output method descriptor + * filter_sys_t: Distort video output method descriptor ***************************************************************************** * This structure is part of the video output thread descriptor. * It describes the Distort specific properties of an output thread. *****************************************************************************/ struct filter_sys_t { + vlc_mutex_t lock; int i_mode; /* 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; @@ -125,13 +135,21 @@ static int Create( vlc_object_t *p_this ) 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 (%4.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; @@ -140,14 +158,8 @@ static int Create( vlc_object_t *p_this ) 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_INTEGER | 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" ); @@ -169,16 +181,24 @@ static int Create( vlc_object_t *p_this ) } 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" ); + + vlc_mutex_init( &p_filter->p_sys->lock ); + 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; @@ -195,13 +215,22 @@ static int Create( vlc_object_t *p_this ) static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; - - 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 ); + filter_sys_t *p_sys = p_filter->p_sys; + + var_DelCallback( p_filter, FILTER_PREFIX "mode", + GradientCallback, p_sys ); + var_DelCallback( p_filter, FILTER_PREFIX "type", + GradientCallback, p_sys ); + var_DelCallback( p_filter, FILTER_PREFIX "cartoon", + GradientCallback, p_sys ); + vlc_mutex_destroy( &p_sys->lock ); + + free( p_sys->p_buf32 ); + free( p_sys->p_buf32_bis ); + free( p_sys->p_buf8 ); + free( p_sys->p_pre_hough ); + + free( p_sys ); } /***************************************************************************** @@ -217,15 +246,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) 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; } + vlc_mutex_lock( &p_filter->p_sys->lock ); switch( p_filter->p_sys->i_mode ) { case EDGE: @@ -243,20 +271,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) default: break; } + vlc_mutex_unlock( &p_filter->p_sys->lock ); - 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 ***************************************************************************** @@ -341,18 +360,14 @@ static void FilterGradient( filter_t *p_filter, picture_t *p_inpic, if( p_filter->p_sys->b_cartoon ) { - 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_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 ); + plane_CopyPixels( &p_outpic->p[U_PLANE], &p_inpic->p[U_PLANE] ); + plane_CopyPixels( &p_outpic->p[V_PLANE], &p_inpic->p[V_PLANE] ); } else { - p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, + 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, + 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 +433,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,18 +500,14 @@ static void FilterEdge( filter_t *p_filter, picture_t *p_inpic, if( p_filter->p_sys->b_cartoon ) { - 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_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 ); + plane_CopyPixels( &p_outpic->p[U_PLANE], &p_inpic->p[U_PLANE] ); + plane_CopyPixels( &p_outpic->p[V_PLANE], &p_inpic->p[V_PLANE] ); } else { - p_filter->p_libvlc->pf_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff, + 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, + 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_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); @@ -634,16 +642,27 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, double d_sin; double d_cos; uint32_t *p_smooth; + int *p_hough = malloc( i_diag * i_nb_steps * sizeof(int) ); if( ! p_hough ) return; + p_smooth = (uint32_t *)malloc( i_num_lines*i_src_visible*sizeof(uint32_t)); - if( !p_smooth ) return; + if( !p_smooth ) + { + free( p_hough ); + return; + } if( ! p_pre_hough ) { msg_Dbg(p_filter, "Starting precalculation"); p_pre_hough = malloc( i_num_lines*i_src_visible*i_nb_steps*sizeof(int)); - if( ! p_pre_hough ) return; + if( ! p_pre_hough ) + { + free( p_smooth ); + free( p_hough ); + return; + } for( i = 0 ; i < i_nb_steps ; i++) { d_sin = sin(d_step * i); @@ -660,15 +679,9 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, memset( p_hough, 0, i_diag * i_nb_steps * sizeof(int) ); - 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_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_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 ); + plane_CopyPixels( &p_outpic->p[Y_PLANE], &p_inpic->p[Y_PLANE] ); + plane_CopyPixels( &p_outpic->p[U_PLANE], &p_inpic->p[U_PLANE] ); + plane_CopyPixels( &p_outpic->p[V_PLANE], &p_inpic->p[V_PLANE] ); GaussianConvolution( p_inpic, p_smooth ); @@ -733,7 +746,49 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, } } - 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; + + vlc_mutex_lock( &p_sys->lock ); + 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; + } + vlc_mutex_unlock( &p_sys->lock ); + + return VLC_SUCCESS; +}