# include "config.h"
#endif
-#include <errno.h>
#include <math.h>
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.h>
-#include "vlc_filter.h"
+#include <vlc_filter.h>
#include "filter_picture.h"
#ifndef M_PI
add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL,
GAMMA_TEXT, GAMMA_LONGTEXT, false )
- add_bool( "brightness-threshold", 0, NULL,
+ add_bool( "brightness-threshold", false, NULL,
THRES_TEXT, THRES_LONGTEXT, false )
add_shortcut( "adjust" )
*****************************************************************************/
struct filter_sys_t
{
+ vlc_mutex_t lock;
double f_contrast;
double f_brightness;
int i_hue;
break;
default:
- msg_Err( p_filter, "Unsupported input chroma (%4s)",
+ msg_Err( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_filter->fmt_in.video.i_chroma) );
return VLC_EGENERIC;
}
p_sys->b_brightness_threshold =
var_CreateGetBoolCommand( p_filter, "brightness-threshold" );
+ vlc_mutex_init( &p_sys->lock );
var_AddCallback( p_filter, "contrast", AdjustCallback, p_sys );
var_AddCallback( p_filter, "brightness", AdjustCallback, p_sys );
var_AddCallback( p_filter, "hue", AdjustCallback, p_sys );
var_DelCallback( p_filter, "brightness-threshold",
AdjustCallback, p_sys );
+ vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
}
return NULL;
}
- /* Getvariables */
+ /* Get variables */
+ vlc_mutex_lock( &p_sys->lock );
i_cont = (int)( p_sys->f_contrast * 255 );
i_lum = (int)( (p_sys->f_brightness - 1.0)*255 );
f_hue = (float)( p_sys->i_hue * M_PI / 180 );
i_sat = (int)( p_sys->f_saturation * 256 );
f_gamma = 1.0 / p_sys->f_gamma;
b_thres = p_sys->b_brightness_threshold;
+ vlc_mutex_unlock( &p_sys->lock );
/*
* Threshold mode drops out everything about luma, contrast and gamma.
/* Fill the gamma lookup table */
for( i = 0 ; i < 256 ; i++ )
{
- pi_gamma[ i ] = clip_uint8_vlc( pow(i / 255.0, f_gamma) * 255.0);
+ pi_gamma[ i ] = clip_uint8_vlc( pow(i / 255.0, f_gamma) * 255.0);
}
/* Fill the luma lookup table */
if( GetPackedYuvOffsets( p_pic->format.i_chroma, &i_y_offset,
&i_u_offset, &i_v_offset ) != VLC_SUCCESS )
{
- msg_Warn( p_filter, "Unsupported input chroma (%4s)",
+ msg_Warn( p_filter, "Unsupported input chroma (%4.4s)",
(char*)&(p_pic->format.i_chroma) );
picture_Release( p_pic );
return NULL;
}
- /* Getvariables */
+ /* Get variables */
+ vlc_mutex_lock( &p_sys->lock );
i_cont = (int)( p_sys->f_contrast * 255 );
i_lum = (int)( (p_sys->f_brightness - 1.0)*255 );
f_hue = (float)( p_sys->i_hue * M_PI / 180 );
i_sat = (int)( p_sys->f_saturation * 256 );
f_gamma = 1.0 / p_sys->f_gamma;
b_thres = p_sys->b_brightness_threshold;
+ vlc_mutex_unlock( &p_sys->lock );
/*
* Threshold mode drops out everything about luma, contrast and gamma.
VLC_UNUSED(p_this); VLC_UNUSED(oldval);
filter_sys_t *p_sys = (filter_sys_t *)p_data;
+ vlc_mutex_lock( &p_sys->lock );
if( !strcmp( psz_var, "contrast" ) )
p_sys->f_contrast = newval.f_float;
else if( !strcmp( psz_var, "brightness" ) )
p_sys->f_gamma = newval.f_float;
else if( !strcmp( psz_var, "brightness-threshold" ) )
p_sys->b_brightness_threshold = newval.b_bool;
- else
- return VLC_EGENERIC;
+ vlc_mutex_unlock( &p_sys->lock );
+
return VLC_SUCCESS;
}