X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fsharpen.c;h=463a32251996fc20c457c60e0e46ebce2a071b7c;hb=0d0e440d0913cdd29eae92685928c9d862cdfd70;hp=0ab4a8550701819bc7f08f83888fe41dba22c9ef;hpb=c06614ec72d87a853a61cc9af9d280f17fb9e0ff;p=vlc diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c index 0ab4a85507..463a322519 100644 --- a/modules/video_filter/sharpen.c +++ b/modules/video_filter/sharpen.c @@ -1,8 +1,8 @@ /***************************************************************************** * sharpen.c: Sharpen video filter ***************************************************************************** - * Copyright (C) 2003 the VideoLAN team - * $Id: sharpen.c 18062 2006-11-26 14:20:34Z zorglub $ + * Copyright (C) 2003-2007 the VideoLAN team + * $Id$ * * Author: Jérémy DEMEULE * Jean-Baptiste Kempf @@ -32,13 +32,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_filter.h" +#include +#include + +#include +#include "filter_picture.h" #define SIG_TEXT N_("Sharpen strength (0-2)") #define SIG_LONGTEXT N_("Set the Sharpen strength, between 0 and 2. Defaults to 0.05.") @@ -50,21 +53,31 @@ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); static picture_t *Filter( filter_t *, picture_t * ); +static int SharpenCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + +#define SHARPEN_HELP N_("Augment contrast between contours.") +#define FILTER_PREFIX "sharpen-" /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("Augment contrast between contours.") ); - set_shortname( _("Sharpen video filter") ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); - set_capability( "video filter2", 0 ); +vlc_module_begin () + set_description( N_("Sharpen video filter") ) + set_shortname( N_("Sharpen") ) + set_help(SHARPEN_HELP) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter2", 0 ) add_float_with_range( "sharpen-sigma", 0.05, 0.0, 2.0, NULL, - SIG_TEXT, SIG_LONGTEXT, VLC_FALSE ); - add_shortcut( "sharpen" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + SIG_TEXT, SIG_LONGTEXT, false ) + add_shortcut( "sharpen" ) + set_callbacks( Create, Destroy ) +vlc_module_end () + +static const char *const ppsz_filter_options[] = { + "sigma", NULL +}; /***************************************************************************** * filter_sys_t: Sharpen video filter descriptor @@ -75,7 +88,8 @@ vlc_module_end(); struct filter_sys_t { - float f_sigma; + vlc_mutex_t lock; + int tab_precalc[512]; }; /***************************************************************************** @@ -86,6 +100,14 @@ inline static int32_t clip( int32_t a ) return (a > 255) ? 255 : (a < 0) ? 0 : a; } +static void init_precalc_table(filter_sys_t *p_filter, float sigma) +{ + for(int i = 0; i < 512; ++i) + { + p_filter->tab_precalc[i] = (i - 256) * sigma; + } +} + /***************************************************************************** * Create: allocates Sharpen video thread output method ***************************************************************************** @@ -98,14 +120,19 @@ static int Create( vlc_object_t *p_this ) /* 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->f_sigma = var_GetFloat(p_this, "sharpen-sigma"); + config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options, + p_filter->p_cfg ); + + float sigma = var_CreateGetFloatCommand( p_filter, FILTER_PREFIX "sigma" ); + init_precalc_table(p_filter->p_sys, sigma); + + vlc_mutex_init( &p_filter->p_sys->lock ); + var_AddCallback( p_filter, FILTER_PREFIX "sigma", + SharpenCallback, p_filter->p_sys ); return VLC_SUCCESS; } @@ -119,7 +146,11 @@ 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 ); + filter_sys_t *p_sys = p_filter->p_sys; + + var_DelCallback( p_filter, FILTER_PREFIX "sigma", SharpenCallback, p_sys ); + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys ); } /***************************************************************************** @@ -133,54 +164,44 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; int i, j; - vlc_value_t val; uint8_t *p_src = NULL; uint8_t *p_out = NULL; int i_src_pitch; + int i_out_pitch; int pix; const int v1 = -1; const int v2 = 3; /* 2^3 = 8 */ if( !p_pic ) return NULL; - if( !p_filter ) return NULL; - if( !p_filter->p_sys ) 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; } /* process the Y plane */ p_src = p_pic->p[Y_PLANE].p_pixels; p_out = p_outpic->p[Y_PLANE].p_pixels; - if( !p_src || !p_out ) - { - msg_Warn( p_filter, "can't get Y plane" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); - return NULL; - } - i_src_pitch = p_pic->p[Y_PLANE].i_visible_pitch; + i_out_pitch = p_outpic->p[Y_PLANE].i_visible_pitch; /* perform convolution only on Y plane. Avoid border line. */ + vlc_mutex_lock( &p_filter->p_sys->lock ); for( i = 0; i < p_pic->p[Y_PLANE].i_visible_lines; i++ ) { if( (i == 0) || (i == p_pic->p[Y_PLANE].i_visible_lines - 1) ) { for( j = 0; j < p_pic->p[Y_PLANE].i_visible_pitch; j++ ) - p_out[i * i_src_pitch + j] = clip( p_src[i * i_src_pitch + j] ); + p_out[i * i_out_pitch + j] = clip( p_src[i * i_src_pitch + j] ); continue ; } for( j = 0; j < p_pic->p[Y_PLANE].i_visible_pitch; j++ ) { if( (j == 0) || (j == p_pic->p[Y_PLANE].i_visible_pitch - 1) ) { - p_out[i * i_src_pitch + j] = p_src[i * i_src_pitch + j]; + p_out[i * i_out_pitch + j] = p_src[i * i_src_pitch + j]; continue ; } @@ -194,29 +215,28 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) (p_src[(i + 1) * i_src_pitch + j ] * v1) + (p_src[(i + 1) * i_src_pitch + j + 1] * v1); - p_out[i * i_src_pitch + j] = clip( p_src[i * i_src_pitch + j] + - (p_filter->p_sys->f_sigma * pix) ); + pix = pix >= 0 ? clip(pix) : -clip(pix * -1); + p_out[i * i_out_pitch + j] = clip( p_src[i * i_src_pitch + j] + + p_filter->p_sys->tab_precalc[pix + 256] ); } } + vlc_mutex_unlock( &p_filter->p_sys->lock ); + plane_CopyPixels( &p_outpic->p[U_PLANE], &p_pic->p[U_PLANE] ); + plane_CopyPixels( &p_outpic->p[V_PLANE], &p_pic->p[V_PLANE] ); - p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, - p_pic->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_pic->p[V_PLANE].p_pixels, - p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); - - - 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; + return CopyInfoAndRelease( p_outpic, p_pic ); +} - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); +static int SharpenCallback( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ) +{ + VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var); + filter_sys_t *p_sys = (filter_sys_t *)p_data; - return p_outpic; + vlc_mutex_lock( &p_sys->lock ); + init_precalc_table(p_sys, __MIN( 2., __MAX( 0., newval.f_float ) )); + vlc_mutex_unlock( &p_sys->lock ); + return VLC_SUCCESS; }