struct filter_sys_t
{
- float f_sigma;
+ vlc_mutex_t lock;
int tab_precalc[512];
};
return (a > 255) ? 255 : (a < 0) ? 0 : a;
}
-static void init_precalc_table(filter_sys_t *p_filter)
+static void init_precalc_table(filter_sys_t *p_filter, float sigma)
{
- float sigma = p_filter->f_sigma;
-
for(int i = 0; i < 512; ++i)
{
p_filter->tab_precalc[i] = (i - 256) * sigma;
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
- p_filter->p_sys->f_sigma =
- var_CreateGetFloatCommand( p_filter, FILTER_PREFIX "sigma" );
+ 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 );
- init_precalc_table(p_filter->p_sys);
-
return VLC_SUCCESS;
}
static void Destroy( vlc_object_t *p_this )
{
filter_t *p_filter = (filter_t *)p_this;
- var_DelCallback( p_filter, FILTER_PREFIX "sigma",
- SharpenCallback, p_filter->p_sys );
- 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 );
}
/*****************************************************************************
i_src_pitch = p_pic->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) )
(p_src[(i + 1) * i_src_pitch + j ] * v1) +
(p_src[(i + 1) * i_src_pitch + j + 1] * v1);
- pix = pix >= 0 ? clip(pix) : -clip(pix * -1);
- p_out[i * i_src_pitch + j] = clip( p_src[i * i_src_pitch + j] +
- p_filter->p_sys->tab_precalc[pix + 256] );
+ pix = pix >= 0 ? clip(pix) : -clip(pix * -1);
+ p_out[i * i_src_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 );
vlc_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 );
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
- VLC_UNUSED(p_this); VLC_UNUSED(oldval);
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval); VLC_UNUSED(psz_var);
filter_sys_t *p_sys = (filter_sys_t *)p_data;
- if( !strcmp( psz_var, FILTER_PREFIX "sigma" ) )
- p_sys->f_sigma = __MIN( 2., __MAX( 0., newval.f_float ) );
- init_precalc_table(p_sys);
+
+ 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;
}