X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmotionblur.c;h=aad8946b0710e680060e009330d974d7c214cbde;hb=2d55ac821c1b75407cece163e9e20c19b49e4212;hp=22fbcba1318b3ff4c02b16d9c304f81eacd4749c;hpb=105e1851a7e7ead3e3fc89a084c222aa65437612;p=vlc diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 22fbcba131..aad8946b07 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -25,14 +25,16 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include "vlc_filter.h" +#include +#include +#include +#include +#include "filter_picture.h" /***************************************************************************** * Local protypes @@ -41,7 +43,9 @@ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); static picture_t *Filter ( filter_t *, picture_t * ); static void RenderBlur ( filter_sys_t *, picture_t *, picture_t * ); -static void Copy ( filter_t *, uint8_t **, picture_t * ); +static void Copy ( filter_t *, picture_t * ); +static int MotionBlurCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); /***************************************************************************** * Module descriptor @@ -49,30 +53,25 @@ static void Copy ( filter_t *, uint8_t **, picture_t * ); #define FACTOR_TEXT N_("Blur factor (1-127)") #define FACTOR_LONGTEXT N_("The degree of blurring from 1 to 127.") -#define PERSISTANT_TEXT N_("Keep inifinte memory of past images") -#define PERSISTANT_LONGTEXT N_("Use \"Result = ( new image * ( 128 - factor ) + factor * old result ) / 128\" instead of \"Result = ( new image * ( 128 - factor ) + factor * old image ) / 128\".") - #define FILTER_PREFIX "blur-" -vlc_module_begin(); - set_shortname( _("Motion blur") ); - set_description( _("Motion blur filter") ); - set_capability( "video filter2", 0 ); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER ); +vlc_module_begin () + set_shortname( N_("Motion blur") ) + set_description( N_("Motion blur filter") ) + set_capability( "video filter2", 0 ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) add_integer_with_range( FILTER_PREFIX "factor", 80, 1, 127, NULL, - FACTOR_TEXT, FACTOR_LONGTEXT, VLC_FALSE ); - add_bool( FILTER_PREFIX "persistant", 0, NULL, PERSISTANT_TEXT, - PERSISTANT_LONGTEXT, VLC_FALSE ); + FACTOR_TEXT, FACTOR_LONGTEXT, false ) - add_shortcut( "blur" ); + add_shortcut( "blur" ) - set_callbacks( Create, Destroy ); -vlc_module_end(); + set_callbacks( Create, Destroy ) +vlc_module_end () -static const char *ppsz_filter_options[] = { - "factor", "persistant", NULL +static const char *const ppsz_filter_options[] = { + "factor", NULL }; /***************************************************************************** @@ -80,8 +79,8 @@ static const char *ppsz_filter_options[] = { *****************************************************************************/ struct filter_sys_t { + vlc_spinlock_t lock; int i_factor; - vlc_bool_t b_persistant; uint8_t **pp_planes; int i_planes; @@ -97,26 +96,18 @@ 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; config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options, p_filter->p_cfg ); - var_Create( p_filter, FILTER_PREFIX "factor", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); p_filter->p_sys->i_factor = - var_GetInteger( p_filter, FILTER_PREFIX "factor" ); - var_Create( p_filter, FILTER_PREFIX "persistant", - VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); - p_filter->p_sys->b_persistant = - var_GetBool( p_filter, FILTER_PREFIX "persistant" ); - - printf("factor: %d\npersitant: %d\n", p_filter->p_sys->i_factor, p_filter->p_sys->b_persistant ); + var_CreateGetIntegerCommand( p_filter, FILTER_PREFIX "factor" ); + vlc_spin_init( &p_filter->p_sys->lock ); + var_AddCallback( p_filter, FILTER_PREFIX "factor", + MotionBlurCallback, p_filter->p_sys ); p_filter->p_sys->pp_planes = NULL; p_filter->p_sys->i_planes = 0; @@ -131,23 +122,16 @@ static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + var_DelCallback( p_filter, FILTER_PREFIX "factor", + MotionBlurCallback, p_filter->p_sys ); + vlc_spin_destroy( &p_filter->p_sys->lock ); + while( p_filter->p_sys->i_planes-- ) free( p_filter->p_sys->pp_planes[p_filter->p_sys->i_planes] ); free( p_filter->p_sys->pp_planes ); free( p_filter->p_sys ); } -#define RELEASE( pic ) \ - if( pic ->pf_release ) \ - pic ->pf_release( pic ); - -#define INITPIC( dst, src ) \ - dst ->date = src ->date; \ - dst ->b_force = src ->b_force; \ - dst ->i_nb_fields = src ->i_nb_fields; \ - dst ->b_progressive = src->b_progressive; \ - dst ->b_top_field_first = src ->b_top_field_first; - /***************************************************************************** * Filter *****************************************************************************/ @@ -158,14 +142,12 @@ 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" ); - RELEASE( p_pic ); + picture_Release( p_pic ); return NULL; } - INITPIC( p_outpic, p_pic ); if( !p_sys->pp_planes ) { @@ -179,15 +161,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_sys->pp_planes[i_plane] = (uint8_t*)malloc( p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines ); } - Copy( p_filter, p_sys->pp_planes, p_pic ); + Copy( p_filter, p_pic ); } /* Get a new picture */ RenderBlur( p_sys, p_pic, p_outpic ); - Copy( p_filter, p_sys->pp_planes, p_sys->b_persistant ? p_outpic : p_pic ); + Copy( p_filter, p_outpic ); - RELEASE( p_pic ); - return p_outpic; + return CopyInfoAndRelease( p_outpic, p_pic ); } /***************************************************************************** @@ -197,8 +178,11 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic, picture_t *p_outpic ) { int i_plane; - int i_oldfactor = p_sys->i_factor; + vlc_spin_lock( &p_sys->lock ); + const int i_oldfactor = p_sys->i_factor; + vlc_spin_unlock( &p_sys->lock ); int i_newfactor = 128 - i_oldfactor; + for( i_plane = 0; i_plane < p_outpic->i_planes; i_plane++ ) { uint8_t *p_old, *p_new, *p_out, *p_out_end, *p_out_line_end; @@ -227,13 +211,29 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic, } } -static void Copy( filter_t *p_filter, uint8_t **pp_planes, picture_t *p_pic ) +static void Copy( filter_t *p_filter, picture_t *p_pic ) { int i_plane; for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) { - p_filter->p_libvlc->pf_memcpy( + vlc_memcpy( p_filter->p_sys->pp_planes[i_plane], p_pic->p[i_plane].p_pixels, p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines ); } } + +static int MotionBlurCallback( 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); + filter_sys_t *p_sys = (filter_sys_t *)p_data; + + if( !strcmp( psz_var, FILTER_PREFIX "factor" ) ) + { + vlc_spin_lock( &p_sys->lock ); + p_sys->i_factor = __MIN( 127, __MAX( 1, newval.i_int ) ); + vlc_spin_unlock( &p_sys->lock ); + } + return VLC_SUCCESS; +}