X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fgradient.c;h=b0585dcdb2a39a5b81f2fe29b116ce55787c8d4b;hb=3dd2478ce13bb16c5f3f55518b057f21d354ef32;hp=994734389fbc040c5ef8032ecbf5f6be2bb292e5;hpb=0ea9e4b45fe355dac074bb811ab0642a388fa9ed;p=vlc diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index 994734389f..b0585dcdb2 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -1,7 +1,7 @@ /***************************************************************************** * 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 @@ -25,16 +25,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include /* sin(), cos() */ -#include +#include +#include #include -#include -#include "vlc_filter.h" +#include +#include "filter_picture.h" enum { GRADIENT, EDGE, HOUGH }; @@ -67,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 const char *mode_list[] = { "gradient", "edge", "hough" }; -static const 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 ); + 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 ); - add_bool( FILTER_PREFIX "cartoon", 1, NULL, - CARTOON_TEXT, CARTOON_LONGTEXT, VLC_FALSE ); + GRADIENT_TEXT, GRADIENT_LONGTEXT, false ) + add_bool( FILTER_PREFIX "cartoon", true, NULL, + 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; @@ -128,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; @@ -166,7 +181,7 @@ 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; } } @@ -177,6 +192,7 @@ static int Create( vlc_object_t *p_this ) p_filter->p_sys->b_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", @@ -199,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 ); } /***************************************************************************** @@ -221,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: @@ -247,17 +271,9 @@ 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 ); } /***************************************************************************** @@ -344,18 +360,18 @@ 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, + 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 ); } @@ -488,20 +504,20 @@ 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, + 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 ); - 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 ); } @@ -634,16 +650,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); @@ -658,16 +685,15 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, msg_Dbg(p_filter, "Precalculation done"); } - p_filter->p_libvlc->pf_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 ); @@ -734,8 +760,8 @@ 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 @@ -744,7 +770,10 @@ 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" ) ) @@ -761,7 +790,7 @@ static int GradientCallback( vlc_object_t *p_this, char const *psz_var, } else { - msg_Err( p_this, "no valid gradient mode provided" ); + msg_Err( p_this, "no valid gradient mode provided (%s)", newval.psz_string ); p_sys->i_mode = GRADIENT; } } @@ -773,5 +802,7 @@ static int GradientCallback( vlc_object_t *p_this, char const *psz_var, { p_sys->b_cartoon = newval.b_bool; } + vlc_mutex_unlock( &p_sys->lock ); + return VLC_SUCCESS; }