/*****************************************************************************
* adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: adjust.c,v 1.6 2003/01/09 15:38:09 sam Exp $
+ * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
+ * $Id$
*
- * Authors: Simon Latapie <garf@via.ecp.fr>, Samuel Hocevar <sam@zoy.org>
+ * Authors: Simon Latapie <garf@via.ecp.fr>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
static void End ( vout_thread_t * );
static void Render ( vout_thread_t *, picture_t * );
+static int SendEvents( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define CONT_TEXT N_("set image contrast")
-#define CONT_LONGTEXT N_("Set the image contrast. Defaults to 1")
-#define HUE_TEXT N_("set image hue")
+#define CONT_TEXT N_("Image contrast (0-2)")
+#define CONT_LONGTEXT N_("Set the image contrast, between 0 and 2. Defaults to 1")
+#define HUE_TEXT N_("Image hue (0-360)")
#define HUE_LONGTEXT N_("Set the image hue, between 0 and 360. Defaults to 0")
-#define SAT_TEXT N_("set image saturation")
-#define SAT_LONGTEXT N_("Set the image saturation. Defaults to 1")
-#define LUM_TEXT N_("set image brightness")
-#define LUM_LONGTEXT N_("Set the image brightness. Defaults to 1")
+#define SAT_TEXT N_("Image saturation (0-3)")
+#define SAT_LONGTEXT N_("Set the image saturation, between 0 and 3. Defaults to 1")
+#define LUM_TEXT N_("Image brightness (0-2)")
+#define LUM_LONGTEXT N_("Set the image brightness, between 0 and 2. Defaults to 1")
+#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();
- add_category_hint( N_("Adjust"), NULL );
- add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, CONT_TEXT, CONT_LONGTEXT );
- add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, LUM_TEXT, LUM_LONGTEXT );
- add_integer_with_range( "hue", 0, 0, 360, NULL, HUE_TEXT, HUE_LONGTEXT );
- add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, SAT_TEXT, SAT_LONGTEXT );
- set_description( _("contrast/hue/saturation/brightness filter") );
+ set_description( _("Image properties filter") );
set_capability( "video filter", 0 );
+
+ add_float_with_range( "contrast", 1.0, 0.0, 2.0, NULL, CONT_TEXT, CONT_LONGTEXT, VLC_FALSE );
+ add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL, LUM_TEXT, LUM_LONGTEXT, VLC_FALSE );
+ add_integer_with_range( "hue", 0, 0, 360, NULL, HUE_TEXT, HUE_LONGTEXT, VLC_FALSE );
+ add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL, SAT_TEXT, SAT_LONGTEXT, VLC_FALSE );
+ add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL, GAMMA_TEXT, GAMMA_LONGTEXT, VLC_FALSE );
+
add_shortcut( "adjust" );
set_callbacks( Create, Destroy );
vlc_module_end();
return (a > 255) ? 255 : (a < 0) ? 0 : a;
}
+/*****************************************************************************
+ * Control: control facility for the vout (forwards to child vout)
+ *****************************************************************************/
+static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+{
+ return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
+}
+
/*****************************************************************************
* Create: allocates adjust video thread output method
*****************************************************************************
p_vout->pf_manage = NULL;
p_vout->pf_render = Render;
p_vout->pf_display = NULL;
+ p_vout->pf_control = Control;
+
+ var_Create( p_vout, "contrast", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "brightness", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "hue", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "saturation", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
+ var_Create( p_vout, "gamma", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT );
return VLC_SUCCESS;
}
ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
+ ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+
+ ADD_PARENT_CALLBACKS( SendEventsToChild );
+
return VLC_SUCCESS;
}
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+ vlc_object_detach( p_vout->p_sys->p_vout );
vout_Destroy( p_vout->p_sys->p_vout );
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
free( p_vout->p_sys );
}
static void Render( vout_thread_t *p_vout, picture_t *p_pic )
{
int pi_luma[256];
+ int pi_gamma[256];
picture_t *p_outpic;
- uint8_t *p_in, *p_out, *p_in_u, *p_in_v, *p_in_end, *p_out_u, *p_out_v;
+ uint8_t *p_in, *p_in_v, *p_in_end, *p_line_end;
+ uint8_t *p_out, *p_out_v;
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;
/* This is a new frame. Get a structure from the video_output. */
while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic );
- /* Get configuration variables */
- i_cont = config_GetFloat( p_vout, "contrast" ) * 255;
- i_lum = (config_GetFloat( p_vout, "brightness" ) - 1.0) * 255;
- f_hue = config_GetInt( p_vout, "hue" ) * M_PI / 180;
- i_sat = config_GetFloat( p_vout, "saturation" ) * 256;
+ /* Getvariables */
+ var_Get( p_vout, "contrast", &val );
+ i_cont = (int) ( val.f_float * 255 );
+ var_Get( p_vout, "brightness", &val );
+ i_lum = (int) (( val.f_float - 1.0 ) * 255 );
+ var_Get( p_vout, "hue", &val );
+ f_hue = (float) ( val.i_int * M_PI / 180 );
+ var_Get( p_vout, "saturation", &val );
+ i_sat = (int) (val.f_float * 256 );
+ var_Get( p_vout, "gamma", &val );
+ f_gamma = 1.0 / val.f_float;
/* 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( pow(i / 255.0, f_gamma) * 255.0);
+ }
+
/* Fill the luma lookup table */
for( i = 0 ; i < 256 ; i++ )
{
- pi_luma[ i ] = clip( i_lum + i_cont * i / 256 );
+ pi_luma[ i ] = pi_gamma[clip( i_lum + i_cont * i / 256)];
}
- /* Do the Y plane */
+ /*
+ * Do the Y plane
+ */
+
p_in = p_pic->p[0].p_pixels;
p_in_end = p_in + p_pic->p[0].i_lines * p_pic->p[0].i_pitch - 8;
for( ; p_in < p_in_end ; )
{
- /* Do 8 pixels at a time */
- *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
- *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
- *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
- *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
- }
+ p_line_end = p_in + p_pic->p[0].i_visible_pitch - 8;
+
+ for( ; p_in < p_line_end ; )
+ {
+ /* Do 8 pixels at a time */
+ *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
+ *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
+ *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
+ *p_out++ = pi_luma[ *p_in++ ]; *p_out++ = pi_luma[ *p_in++ ];
+ }
- p_in_end += 8;
+ p_line_end += 8;
- for( ; p_in < p_in_end ; )
- {
- *p_out++ = pi_luma[ *p_in++ ];
+ for( ; p_in < p_line_end ; )
+ {
+ *p_out++ = pi_luma[ *p_in++ ];
+ }
+
+ p_in += p_pic->p[0].i_pitch - p_pic->p[0].i_visible_pitch;
+ p_out += p_outpic->p[0].i_pitch - p_outpic->p[0].i_visible_pitch;
}
- /* Do the U and V planes */
- p_in_u = p_pic->p[1].p_pixels;
+ /*
+ * Do the U and V planes
+ */
+
+ p_in = p_pic->p[1].p_pixels;
p_in_v = p_pic->p[2].p_pixels;
- p_in_end = p_in_u + p_pic->p[1].i_lines * p_pic->p[1].i_pitch - 8;
+ p_in_end = p_in + p_pic->p[1].i_lines * p_pic->p[1].i_pitch - 8;
- p_out_u = p_outpic->p[1].p_pixels;
+ p_out = p_outpic->p[1].p_pixels;
p_out_v = p_outpic->p[2].p_pixels;
i_sin = sin(f_hue) * 256;
if ( i_sat > 256 )
{
#define WRITE_UV_CLIP() \
- i_u = *p_in_u++ ; i_v = *p_in_v++ ; \
- *p_out_u++ = clip( (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \
+ i_u = *p_in++ ; i_v = *p_in_v++ ; \
+ *p_out++ = clip( (( ((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) \
* i_sat) >> 8) + 128)
uint8_t i_u, i_v;
- for( ; p_in_u < p_in_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_in_end += 8;
-
- for( ; p_in_u < p_in_end ; )
+ for( ; p_in < p_in_end ; )
{
- WRITE_UV_CLIP();
+ p_line_end = p_in + p_pic->p[1].i_visible_pitch - 8;
+
+ 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;
+
+ for( ; p_in < p_line_end ; )
+ {
+ WRITE_UV_CLIP();
+ }
+
+ p_in += p_pic->p[1].i_pitch - p_pic->p[1].i_visible_pitch;
+ p_in_v += p_pic->p[2].i_pitch - p_pic->p[2].i_visible_pitch;
+ p_out += p_outpic->p[1].i_pitch - p_outpic->p[1].i_visible_pitch;
+ p_out_v += p_outpic->p[2].i_pitch - p_outpic->p[2].i_visible_pitch;
}
}
else
{
#define WRITE_UV() \
- i_u = *p_in_u++ ; i_v = *p_in_v++ ; \
- *p_out_u++ = (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \
+ i_u = *p_in++ ; i_v = *p_in_v++ ; \
+ *p_out++ = (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \
* i_sat) >> 8) + 128; \
*p_out_v++ = (( ((i_v * i_cos - i_u * i_sin - i_y) >> 8) \
* i_sat) >> 8) + 128
uint8_t i_u, i_v;
- for( ; p_in_u < p_in_end ; )
+ for( ; p_in < p_in_end ; )
{
- /* Do 8 pixels at a time */
- WRITE_UV(); WRITE_UV(); WRITE_UV(); WRITE_UV();
- WRITE_UV(); WRITE_UV(); WRITE_UV(); WRITE_UV();
- }
-
- p_in_end += 8;
-
- for( ; p_in_u < p_in_end ; )
- {
- WRITE_UV();
+ p_line_end = p_in + p_pic->p[1].i_visible_pitch - 8;
+
+ 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;
+
+ for( ; p_in < p_line_end ; )
+ {
+ WRITE_UV();
+ }
+
+ p_in += p_pic->p[1].i_pitch - p_pic->p[1].i_visible_pitch;
+ p_in_v += p_pic->p[2].i_pitch - p_pic->p[2].i_visible_pitch;
+ p_out += p_outpic->p[1].i_pitch - p_outpic->p[1].i_visible_pitch;
+ p_out_v += p_outpic->p[2].i_pitch - p_outpic->p[2].i_visible_pitch;
}
}
vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
}
+/*****************************************************************************
+ * SendEvents: forward mouse and keyboard events to the parent p_vout
+ *****************************************************************************/
+static int SendEvents( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ var_Set( (vlc_object_t *)p_data, psz_var, newval );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * SendEventsToChild: forward events to the child/children vout
+ *****************************************************************************/
+static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+ vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ var_Set( p_vout->p_sys->p_vout, psz_var, newval );
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff