X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmotionblur.c;h=6cca33932d749529caf11e196fd6b3b01f74a358;hb=23566858e9dae7083730cb5525c4342a1e8dbaf4;hp=8088ac94e0b87f1acf150a8de3a46f44f2f5a02b;hpb=e40d134c69b144327fd1d2001e8b85640f5c7cb9;p=vlc diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index 8088ac94e0..6cca33932d 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -26,10 +26,15 @@ * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include -#include #include +#include "filter_picture.h" /***************************************************************************** * Local protypes @@ -38,7 +43,6 @@ 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 int MotionBlurCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); @@ -50,22 +54,22 @@ static int MotionBlurCallback( vlc_object_t *, char const *, #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 ); + 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[] = { +static const char *const ppsz_filter_options[] = { "factor", NULL }; @@ -74,10 +78,11 @@ static const char *ppsz_filter_options[] = { *****************************************************************************/ struct filter_sys_t { - int i_factor; + picture_t *p_tmp; + bool b_first; - uint8_t **pp_planes; - int i_planes; + vlc_spinlock_t lock; + int i_factor; }; /***************************************************************************** @@ -90,10 +95,15 @@ 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 ) + return VLC_ENOMEM; + + p_filter->p_sys->p_tmp = picture_NewFromFormat( &p_filter->fmt_in.video ); + if( !p_filter->p_sys->p_tmp ) { - msg_Err( p_filter, "out of memory" ); + free( p_filter->p_sys ); return VLC_ENOMEM; } + p_filter->p_sys->b_first = true; p_filter->pf_video_filter = Filter; @@ -102,11 +112,10 @@ static int Create( vlc_object_t *p_this ) p_filter->p_sys->i_factor = 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; return VLC_SUCCESS; } @@ -118,23 +127,14 @@ static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; - 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 ); + var_DelCallback( p_filter, FILTER_PREFIX "factor", + MotionBlurCallback, p_filter->p_sys ); + vlc_spin_destroy( &p_filter->p_sys->lock ); + + picture_Release( p_filter->p_sys->p_tmp ); 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 *****************************************************************************/ @@ -145,36 +145,25 @@ 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 ) + if( p_sys->b_first ) { - /* initialise our picture buffer */ - int i_plane; - p_sys->i_planes = p_pic->i_planes; - p_sys->pp_planes = - (uint8_t**)malloc( p_sys->i_planes * sizeof( uint8_t * ) ); - for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) - { - 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 ); + picture_CopyPixels( p_sys->p_tmp, p_pic ); + p_sys->b_first = false; } /* Get a new picture */ RenderBlur( p_sys, p_pic, p_outpic ); - Copy( p_filter, p_sys->pp_planes, p_outpic ); - RELEASE( p_pic ); - return p_outpic; + picture_CopyPixels( p_sys->p_tmp, p_outpic ); + + return CopyInfoAndRelease( p_outpic, p_pic ); } /***************************************************************************** @@ -184,19 +173,21 @@ 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; - const int i_pitch = p_outpic->p[i_plane].i_pitch; const int i_visible_pitch = p_outpic->p[i_plane].i_visible_pitch; const int i_visible_lines = p_outpic->p[i_plane].i_visible_lines; p_out = p_outpic->p[i_plane].p_pixels; p_new = p_newpic->p[i_plane].p_pixels; - p_old = p_sys->pp_planes[i_plane]; - p_out_end = p_out + i_pitch * i_visible_lines; + p_old = p_sys->p_tmp->p[i_plane].p_pixels; + p_out_end = p_out + p_outpic->p[i_plane].i_pitch * i_visible_lines; while ( p_out < p_out_end ) { p_out_line_end = p_out + i_visible_pitch; @@ -207,30 +198,25 @@ static void RenderBlur( filter_sys_t *p_sys, picture_t *p_newpic, ((*p_new++) * i_newfactor)) >> 7; } - p_old += i_pitch - i_visible_pitch; - p_new += i_pitch - i_visible_pitch; - p_out += i_pitch - i_visible_pitch; + p_old += p_sys->p_tmp->p[i_plane].i_pitch - i_visible_pitch; + p_new += p_newpic->p[i_plane].i_pitch - i_visible_pitch; + p_out += p_outpic->p[i_plane].i_pitch - i_visible_pitch; } } } -static void Copy( filter_t *p_filter, uint8_t **pp_planes, 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( - 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; }