X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fadjust.c;h=35f7e1d824df73a3ab0a7a8f7c6014633df899c2;hb=d45fa422b40406ae66512d14d3d44517708f13fb;hp=8225632c041a0d709c93f1912a915110d73c13c3;hpb=ae0b191df59c3f49e58d0bb3e9b3b020920f31b6;p=vlc diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index 8225632c04..35f7e1d824 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -25,16 +25,19 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include /* malloc(), free() */ -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include -#include -#include +#include +#include +#include -#include "vlc_filter.h" +#include +#include "filter_picture.h" #ifndef M_PI # define M_PI 3.14159265358979323846 @@ -48,7 +51,11 @@ static int Create ( vlc_object_t * ); static void Destroy ( vlc_object_t * ); -static picture_t *Filter( filter_t *, picture_t * ); +static picture_t *FilterPlanar( filter_t *, picture_t * ); +static picture_t *FilterPacked( filter_t *, picture_t * ); +static int AdjustCallback( vlc_object_t *p_this, char const *psz_var, + vlc_value_t oldval, vlc_value_t newval, + void *p_data ); /***************************************************************************** * Module descriptor @@ -69,32 +76,32 @@ static picture_t *Filter( filter_t *, picture_t * ); #define GAMMA_TEXT N_("Image gamma (0-10)") #define GAMMA_LONGTEXT N_("Set the image gamma, between 0.01 and 10. Defaults to 1.") -vlc_module_begin(); - set_description( _("Image properties filter") ); - set_shortname( N_("Image adjust" )); - set_category( CAT_VIDEO ); - set_subcategory( SUBCAT_VIDEO_VFILTER2 ); - set_capability( "video filter2", 0 ); +vlc_module_begin () + set_description( N_("Image properties filter") ) + set_shortname( N_("Image adjust" )) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_VFILTER ) + set_capability( "video filter2", 0 ) add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, - CONT_TEXT, CONT_LONGTEXT, VLC_FALSE ); + CONT_TEXT, CONT_LONGTEXT, false ) add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, - LUM_TEXT, LUM_LONGTEXT, VLC_FALSE ); + LUM_TEXT, LUM_LONGTEXT, false ) add_integer_with_range( "hue", 0, 0, 360, NULL, - HUE_TEXT, HUE_LONGTEXT, VLC_FALSE ); + HUE_TEXT, HUE_LONGTEXT, false ) add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, - SAT_TEXT, SAT_LONGTEXT, VLC_FALSE ); + SAT_TEXT, SAT_LONGTEXT, false ) add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL, - GAMMA_TEXT, GAMMA_LONGTEXT, VLC_FALSE ); + GAMMA_TEXT, GAMMA_LONGTEXT, false ) - add_bool( "brightness-threshold", 0, NULL, - THRES_TEXT, THRES_LONGTEXT, VLC_FALSE ); + add_bool( "brightness-threshold", false, NULL, + THRES_TEXT, THRES_LONGTEXT, false ) - add_shortcut( "adjust" ); - set_callbacks( Create, Destroy ); -vlc_module_end(); + add_shortcut( "adjust" ) + set_callbacks( Create, Destroy ) +vlc_module_end () -static const char *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "contrast", "brightness", "hue", "saturation", "gamma", "brightness-threshold", NULL }; @@ -104,49 +111,39 @@ static const char *ppsz_filter_options[] = { *****************************************************************************/ struct filter_sys_t { + vlc_mutex_t lock; + double f_contrast; + double f_brightness; + int i_hue; + double f_saturation; + double f_gamma; + bool b_brightness_threshold; }; -inline static int32_t clip( int32_t a ) -{ - return (a > 255) ? 255 : (a < 0) ? 0 : a; -} - /***************************************************************************** - * Create: allocates adjust video thread output method - ***************************************************************************** - * This function allocates and initializes a adjust vout method. + * Create: allocates adjust video filter *****************************************************************************/ static int Create( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; - /* XXX: we might need to add/remove some FOURCCs ... */ - if( p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','Y','U','V') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','1','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','U','Y','V') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('U','Y','V','Y') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('U','Y','N','V') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','4','2','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('c','y','u','v') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','Y','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','N','V') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','Y','U') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','1','1') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','1','0') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','V','U','9') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','M','G','A') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','2','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','2','2') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('I','4','4','4') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('J','4','4','4') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','P') - && p_filter->fmt_in.video.i_chroma != VLC_FOURCC('Y','U','V','A') ) + switch( p_filter->fmt_in.video.i_chroma ) { - msg_Err( p_filter, "Unsupported input chroma (%4s)", - (char*)&(p_filter->fmt_in.video.i_chroma) ); - return VLC_EGENERIC; + CASE_PLANAR_YUV + /* Planar YUV */ + p_filter->pf_video_filter = FilterPlanar; + break; + + CASE_PACKED_YUV_422 + /* Packed YUV 4:2:2 */ + p_filter->pf_video_filter = FilterPacked; + break; + + default: + msg_Err( p_filter, "Unsupported input chroma (%4.4s)", + (char*)&(p_filter->fmt_in.video.i_chroma) ); + return VLC_EGENERIC; } if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma ) @@ -158,53 +155,58 @@ 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 ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } - - p_filter->pf_video_filter = Filter; + p_sys = p_filter->p_sys; /* needed to get options passed in transcode using the * adjust{name=value} syntax */ - sout_CfgParse( p_filter, "", ppsz_filter_options, + config_ChainParse( p_filter, "", ppsz_filter_options, p_filter->p_cfg ); - var_Create( p_filter, "contrast", - VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); - var_Create( p_filter, "brightness", - VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); - var_Create( p_filter, "hue", - VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_filter, "saturation", - VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); - var_Create( p_filter, "gamma", - VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); - var_Create( p_filter, "brightness-threshold", - VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + p_sys->f_contrast = var_CreateGetFloatCommand( p_filter, "contrast" ); + p_sys->f_brightness = var_CreateGetFloatCommand( p_filter, "brightness" ); + p_sys->i_hue = var_CreateGetIntegerCommand( p_filter, "hue" ); + p_sys->f_saturation = var_CreateGetFloatCommand( p_filter, "saturation" ); + p_sys->f_gamma = var_CreateGetFloatCommand( p_filter, "gamma" ); + 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_AddCallback( p_filter, "saturation", AdjustCallback, p_sys ); + var_AddCallback( p_filter, "gamma", AdjustCallback, p_sys ); + var_AddCallback( p_filter, "brightness-threshold", + AdjustCallback, p_sys ); return VLC_SUCCESS; } /***************************************************************************** - * Destroy: destroy adjust video thread output method - ***************************************************************************** - * Terminate an output method created by adjustCreateOutputMethod + * Destroy: destroy adjust video filter *****************************************************************************/ static void Destroy( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; - free( p_filter->p_sys ); + filter_sys_t *p_sys = p_filter->p_sys; + + var_DelCallback( p_filter, "contrast", AdjustCallback, p_sys ); + var_DelCallback( p_filter, "brightness", AdjustCallback, p_sys ); + var_DelCallback( p_filter, "hue", AdjustCallback, p_sys ); + var_DelCallback( p_filter, "saturation", AdjustCallback, p_sys ); + var_DelCallback( p_filter, "gamma", AdjustCallback, p_sys ); + var_DelCallback( p_filter, "brightness-threshold", + AdjustCallback, p_sys ); + + vlc_mutex_destroy( &p_sys->lock ); + free( p_sys ); } /***************************************************************************** - * Render: displays previously rendered output - ***************************************************************************** - * This function send the currently rendered image to adjust modified image, - * waits until it is displayed and switch the two rendering buffers, preparing - * next frame. + * Run the filter on a Planar YUV picture *****************************************************************************/ -static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) +static picture_t *FilterPlanar( filter_t *p_filter, picture_t *p_pic ) { int pi_luma[256]; int pi_gamma[256]; @@ -213,43 +215,38 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) uint8_t *p_in, *p_in_v, *p_in_end, *p_line_end; uint8_t *p_out, *p_out_v; - vlc_bool_t b_thres; + bool b_thres; double f_hue; double f_gamma; int32_t i_cont, i_lum; int i_sat, i_sin, i_cos, i_x, i_y; int i; - vlc_value_t val; + + filter_sys_t *p_sys = p_filter->p_sys; 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" ); - if( p_pic->pf_release ) - p_pic->pf_release( p_pic ); + picture_Release( p_pic ); return NULL; } - /* Getvariables */ - var_Get( p_filter, "contrast", &val ); - i_cont = (int) ( val.f_float * 255 ); - var_Get( p_filter, "brightness", &val ); - i_lum = (int) (( val.f_float - 1.0 ) * 255 ); - var_Get( p_filter, "hue", &val ); - f_hue = (float) ( val.i_int * M_PI / 180 ); - var_Get( p_filter, "saturation", &val ); - i_sat = (int) (val.f_float * 256 ); - var_Get( p_filter, "gamma", &val ); - f_gamma = 1.0 / val.f_float; - var_Get( p_filter, "brightness-threshold", &val ); - b_thres = (vlc_bool_t) ( val.b_bool ); + /* 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. */ - if( b_thres != VLC_TRUE ) + if( b_thres != true ) { /* Contrast is a fast but kludged function, so I put this gap to be @@ -259,13 +256,13 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) /* Fill the gamma lookup table */ for( i = 0 ; i < 256 ; i++ ) { - pi_gamma[ i ] = clip( 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 */ for( i = 0 ; i < 256 ; i++ ) { - pi_luma[ i ] = pi_gamma[clip( i_lum + i_cont * i / 256)]; + pi_luma[ i ] = pi_gamma[clip_uint8_vlc( i_lum + i_cont * i / 256)]; } } else @@ -343,9 +340,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { #define WRITE_UV_CLIP() \ i_u = *p_in++ ; i_v = *p_in_v++ ; \ - *p_out++ = clip( (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \ + *p_out++ = clip_uint8_vlc( (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \ * i_sat) >> 8) + 128); \ - *p_out_v++ = clip( (( ((i_v * i_cos - i_u * i_sin - i_y) >> 8) \ + *p_out_v++ = clip_uint8_vlc( (( ((i_v * i_cos - i_u * i_sin - i_y) >> 8) \ * i_sat) >> 8) + 128) uint8_t i_u, i_v; @@ -379,6 +376,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_out_v += p_outpic->p[V_PLANE].i_pitch - p_outpic->p[V_PLANE].i_visible_pitch; } +#undef WRITE_UV_CLIP } else { @@ -418,15 +416,268 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_out_v += p_outpic->p[V_PLANE].i_pitch - p_outpic->p[V_PLANE].i_visible_pitch; } +#undef WRITE_UV + } + + return CopyInfoAndRelease( p_outpic, p_pic ); +} + +/***************************************************************************** + * Run the filter on a Packed YUV picture + *****************************************************************************/ +static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic ) +{ + int pi_luma[256]; + int pi_gamma[256]; + + picture_t *p_outpic; + uint8_t *p_in, *p_in_v, *p_in_end, *p_line_end; + uint8_t *p_out, *p_out_v; + int i_y_offset, i_u_offset, i_v_offset; + + int i_lines, i_visible_lines, i_pitch, i_visible_pitch; + + bool b_thres; + double f_hue; + double f_gamma; + int32_t i_cont, i_lum; + int i_sat, i_sin, i_cos, i_x, i_y; + int i; + + filter_sys_t *p_sys = p_filter->p_sys; + + if( !p_pic ) return NULL; + + i_lines = p_pic->p->i_lines; + i_visible_lines = p_pic->p->i_visible_lines; + i_pitch = p_pic->p->i_pitch; + i_visible_pitch = p_pic->p->i_visible_pitch; + + 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 (%4.4s)", + (char*)&(p_pic->format.i_chroma) ); + + picture_Release( p_pic ); + return NULL; + } + + p_outpic = filter_NewPicture( p_filter ); + if( !p_outpic ) + { + msg_Warn( p_filter, "can't get output picture" ); + + picture_Release( p_pic ); + return NULL; + } + + /* 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. + */ + if( b_thres != true ) + { + + /* Contrast is a fast but kludged function, so I put this gap to be + * cleaner :) */ + i_lum += 128 - i_cont / 2; + + /* 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); + } + + /* Fill the luma lookup table */ + for( i = 0 ; i < 256 ; i++ ) + { + pi_luma[ i ] = pi_gamma[clip_uint8_vlc( i_lum + i_cont * i / 256)]; + } + } + else + { + /* + * We get luma as threshold value: the higher it is, the darker is + * the image. Should I reverse this? + */ + for( i = 0 ; i < 256 ; i++ ) + { + pi_luma[ i ] = (i < i_lum) ? 0 : 255; + } + + /* + * Desaturates image to avoid that strange yellow halo... + */ + i_sat = 0; + } + + /* + * Do the Y plane + */ + + p_in = p_pic->p->p_pixels + i_y_offset; + p_in_end = p_in + p_pic->p->i_visible_lines * p_pic->p->i_pitch - 8 * 4; + + p_out = p_outpic->p->p_pixels + i_y_offset; + + for( ; p_in < p_in_end ; ) + { + p_line_end = p_in + i_visible_pitch - 8 * 4; + + for( ; p_in < p_line_end ; ) + { + /* Do 8 pixels at a time */ + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + } + + p_line_end += 8 * 4; + + for( ; p_in < p_line_end ; ) + { + *p_out = pi_luma[ *p_in ]; p_in += 2; p_out += 2; + } + + p_in += i_pitch - p_pic->p->i_visible_pitch; + p_out += i_pitch - p_outpic->p->i_visible_pitch; } - p_outpic->date = p_pic->date; - p_outpic->b_force = p_pic->b_force; - p_outpic->i_nb_fields = p_pic->i_nb_fields; - p_outpic->b_progressive = p_pic->b_progressive; - p_outpic->b_top_field_first = p_pic->b_top_field_first; + /* + * Do the U and V planes + */ + + p_in = p_pic->p->p_pixels + i_u_offset; + p_in_v = p_pic->p->p_pixels + i_v_offset; + p_in_end = p_in + i_visible_lines * i_pitch - 8 * 4; - p_pic->pf_release( p_pic ); + p_out = p_outpic->p->p_pixels + i_u_offset; + p_out_v = p_outpic->p->p_pixels + i_v_offset; - return p_outpic; + i_sin = sin(f_hue) * 256; + i_cos = cos(f_hue) * 256; + + i_x = ( cos(f_hue) + sin(f_hue) ) * 32768; + i_y = ( cos(f_hue) - sin(f_hue) ) * 32768; + + if ( i_sat > 256 ) + { +#define WRITE_UV_CLIP() \ + i_u = *p_in; p_in += 4; i_v = *p_in_v; p_in_v += 4; \ + *p_out = clip_uint8_vlc( (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \ + * i_sat) >> 8) + 128); \ + p_out += 4; \ + *p_out_v = clip_uint8_vlc( (( ((i_v * i_cos - i_u * i_sin - i_y) >> 8) \ + * i_sat) >> 8) + 128); \ + p_out_v += 4 + + uint8_t i_u, i_v; + + for( ; p_in < p_in_end ; ) + { + p_line_end = p_in + i_visible_pitch - 8 * 4; + + for( ; p_in < p_line_end ; ) + { + /* Do 8 pixels at a time */ + WRITE_UV_CLIP(); WRITE_UV_CLIP(); + WRITE_UV_CLIP(); WRITE_UV_CLIP(); + WRITE_UV_CLIP(); WRITE_UV_CLIP(); + WRITE_UV_CLIP(); WRITE_UV_CLIP(); + } + + p_line_end += 8 * 4; + + for( ; p_in < p_line_end ; ) + { + WRITE_UV_CLIP(); + } + + p_in += i_pitch - i_visible_pitch; + p_in_v += i_pitch - i_visible_pitch; + p_out += i_pitch - i_visible_pitch; + p_out_v += i_pitch - i_visible_pitch; + } +#undef WRITE_UV_CLIP + } + else + { +#define WRITE_UV() \ + i_u = *p_in; p_in += 4; i_v = *p_in_v; p_in_v += 4; \ + *p_out = (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \ + * i_sat) >> 8) + 128; \ + p_out += 4; \ + *p_out_v = (( ((i_v * i_cos - i_u * i_sin - i_y) >> 8) \ + * i_sat) >> 8) + 128; \ + p_out_v += 4 + + uint8_t i_u, i_v; + + for( ; p_in < p_in_end ; ) + { + p_line_end = p_in + i_visible_pitch - 8 * 4; + + for( ; p_in < p_line_end ; ) + { + /* Do 8 pixels at a time */ + WRITE_UV(); WRITE_UV(); WRITE_UV(); WRITE_UV(); + WRITE_UV(); WRITE_UV(); WRITE_UV(); WRITE_UV(); + } + + p_line_end += 8 * 4; + + for( ; p_in < p_line_end ; ) + { + WRITE_UV(); + } + + p_in += i_pitch - i_visible_pitch; + p_in_v += i_pitch - i_visible_pitch; + p_out += i_pitch - i_visible_pitch; + p_out_v += i_pitch - i_visible_pitch; + } +#undef WRITE_UV + } + + return CopyInfoAndRelease( p_outpic, p_pic ); +} + +static int AdjustCallback( 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; + + 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_brightness = newval.f_float; + else if( !strcmp( psz_var, "hue" ) ) + p_sys->i_hue = newval.i_int; + else if( !strcmp( psz_var, "saturation" ) ) + p_sys->f_saturation = newval.f_float; + else if( !strcmp( psz_var, "gamma" ) ) + p_sys->f_gamma = newval.f_float; + else if( !strcmp( psz_var, "brightness-threshold" ) ) + p_sys->b_brightness_threshold = newval.b_bool; + vlc_mutex_unlock( &p_sys->lock ); + + return VLC_SUCCESS; }