vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sat Nov 10 22:31:09 2012 +0200| [2db07444913237d2871f915905d4a4de1e646e60] | committer: Rémi Denis-Courmont
posterize: use atomic variable instead of lock > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2db07444913237d2871f915905d4a4de1e646e60 --- modules/video_filter/posterize.c | 38 ++++++++++++++------------------------ 1 file changed, 14 insertions(+), 24 deletions(-) diff --git a/modules/video_filter/posterize.c b/modules/video_filter/posterize.c index f0f3a1f..d7c9383 100644 --- a/modules/video_filter/posterize.c +++ b/modules/video_filter/posterize.c @@ -29,10 +29,11 @@ # include "config.h" #endif +#include <assert.h> + #include <vlc_common.h> #include <vlc_plugin.h> - -#include <assert.h> +#include <vlc_atomic.h> #include <vlc_filter.h> #include "filter_picture.h" @@ -86,8 +87,7 @@ static int FilterCallback( vlc_object_t *, char const *, *****************************************************************************/ struct filter_sys_t { - int i_level; - vlc_mutex_t lock; + atomic_int i_level; }; /***************************************************************************** @@ -129,11 +129,10 @@ static int Create( vlc_object_t *p_this ) config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, p_filter->p_cfg ); - p_sys->i_level = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "level" ); - - vlc_mutex_init( &p_sys->lock ); + atomic_init( &p_sys->i_level, + var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "level" ) ); - var_AddCallback( p_filter, CFG_PREFIX "level", FilterCallback, NULL ); + var_AddCallback( p_filter, CFG_PREFIX "level", FilterCallback, p_sys ); p_filter->pf_video_filter = Filter; @@ -148,11 +147,10 @@ static int Create( vlc_object_t *p_this ) static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys = p_filter->p_sys; - var_DelCallback( p_filter, CFG_PREFIX "level", FilterCallback, NULL ); - - vlc_mutex_destroy( &p_filter->p_sys->lock ); - free( p_filter->p_sys ); + var_DelCallback( p_filter, CFG_PREFIX "level", FilterCallback, p_sys ); + free( p_sys ); } /***************************************************************************** @@ -165,14 +163,11 @@ static void Destroy( vlc_object_t *p_this ) static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { picture_t *p_outpic; - int level; if( !p_pic ) return NULL; filter_sys_t *p_sys = p_filter->p_sys; - vlc_mutex_lock( &p_sys->lock ); - level = p_sys->i_level; - vlc_mutex_unlock( &p_sys->lock ); + int level = atomic_load( &p_sys->i_level ); p_outpic = filter_NewPicture( p_filter ); if( !p_outpic ) @@ -442,16 +437,11 @@ static void YuvPosterization( uint8_t* posterized_y1, uint8_t* posterized_y2, static int FilterCallback ( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { - (void)oldval; (void)p_data; - filter_t *p_filter = (filter_t*)p_this; - filter_sys_t *p_sys = p_filter->p_sys; + (void)p_this; (void)oldval; + filter_sys_t *p_sys = p_data; if( !strcmp( psz_var, CFG_PREFIX "level" ) ) - { - vlc_mutex_lock( &p_sys->lock ); - p_sys->i_level = newval.i_int; - vlc_mutex_unlock( &p_sys->lock ); - } + atomic_store( &p_sys->i_level, newval.i_int ); return VLC_SUCCESS; } _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
