Commit 2db07444 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

posterize: use atomic variable instead of lock

parent 62daf8e8
...@@ -29,10 +29,11 @@ ...@@ -29,10 +29,11 @@
# include "config.h" # include "config.h"
#endif #endif
#include <assert.h>
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_plugin.h> #include <vlc_plugin.h>
#include <vlc_atomic.h>
#include <assert.h>
#include <vlc_filter.h> #include <vlc_filter.h>
#include "filter_picture.h" #include "filter_picture.h"
...@@ -86,8 +87,7 @@ static int FilterCallback( vlc_object_t *, char const *, ...@@ -86,8 +87,7 @@ static int FilterCallback( vlc_object_t *, char const *,
*****************************************************************************/ *****************************************************************************/
struct filter_sys_t struct filter_sys_t
{ {
int i_level; atomic_int i_level;
vlc_mutex_t lock;
}; };
/***************************************************************************** /*****************************************************************************
...@@ -129,11 +129,10 @@ static int Create( vlc_object_t *p_this ) ...@@ -129,11 +129,10 @@ static int Create( vlc_object_t *p_this )
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg ); p_filter->p_cfg );
p_sys->i_level = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "level" ); atomic_init( &p_sys->i_level,
var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "level" ) );
vlc_mutex_init( &p_sys->lock );
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; p_filter->pf_video_filter = Filter;
...@@ -148,11 +147,10 @@ static int Create( vlc_object_t *p_this ) ...@@ -148,11 +147,10 @@ static int Create( vlc_object_t *p_this )
static void Destroy( vlc_object_t *p_this ) static void Destroy( vlc_object_t *p_this )
{ {
filter_t *p_filter = (filter_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 ); var_DelCallback( p_filter, CFG_PREFIX "level", FilterCallback, p_sys );
free( p_sys );
vlc_mutex_destroy( &p_filter->p_sys->lock );
free( p_filter->p_sys );
} }
/***************************************************************************** /*****************************************************************************
...@@ -165,14 +163,11 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -165,14 +163,11 @@ static void Destroy( vlc_object_t *p_this )
static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{ {
picture_t *p_outpic; picture_t *p_outpic;
int level;
if( !p_pic ) return NULL; if( !p_pic ) return NULL;
filter_sys_t *p_sys = p_filter->p_sys; filter_sys_t *p_sys = p_filter->p_sys;
vlc_mutex_lock( &p_sys->lock ); int level = atomic_load( &p_sys->i_level );
level = p_sys->i_level;
vlc_mutex_unlock( &p_sys->lock );
p_outpic = filter_NewPicture( p_filter ); p_outpic = filter_NewPicture( p_filter );
if( !p_outpic ) if( !p_outpic )
...@@ -442,16 +437,11 @@ static void YuvPosterization( uint8_t* posterized_y1, uint8_t* posterized_y2, ...@@ -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, static int FilterCallback ( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data ) vlc_value_t oldval, vlc_value_t newval, void *p_data )
{ {
(void)oldval; (void)p_data; (void)p_this; (void)oldval;
filter_t *p_filter = (filter_t*)p_this; filter_sys_t *p_sys = p_data;
filter_sys_t *p_sys = p_filter->p_sys;
if( !strcmp( psz_var, CFG_PREFIX "level" ) ) if( !strcmp( psz_var, CFG_PREFIX "level" ) )
{ atomic_store( &p_sys->i_level, newval.i_int );
vlc_mutex_lock( &p_sys->lock );
p_sys->i_level = newval.i_int;
vlc_mutex_unlock( &p_sys->lock );
}
return VLC_SUCCESS; return VLC_SUCCESS;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment