X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fgradient.c;h=f1c57cdeefe761bdfa96ba2b255b5f1bf54c1f56;hb=688f0a8d8913f20ac5d3e27bf4f2bbe35c9f5de7;hp=64cdc64719a67f2e7783fdbb0298f2dbdd1f9e80;hpb=e40d134c69b144327fd1d2001e8b85640f5c7cb9;p=vlc diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index 64cdc64719..f1c57cdeef 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 @@ -26,13 +26,19 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include /* sin(), cos() */ -#include +#include +#include #include #include #include "vlc_filter.h" +#include "filter_picture.h" enum { GRADIENT, EDGE, HOUGH }; @@ -65,32 +71,32 @@ 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") }; +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_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 }; @@ -106,7 +112,7 @@ struct filter_sys_t /* 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; @@ -126,13 +132,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 (%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; @@ -219,12 +233,10 @@ 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; } @@ -246,16 +258,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) 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 ); } /***************************************************************************** @@ -342,18 +345,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 ); } @@ -486,20 +489,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 ); } @@ -656,16 +659,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 ); @@ -732,8 +734,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 @@ -742,6 +744,7 @@ 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" ) ) {