/*****************************************************************************
* adjust.c : Contrast/Hue/Saturation/Brightness video plugin for vlc
*****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
- * $Id: adjust.c,v 1.3 2002/11/28 21:49:04 garf Exp $
+ * Copyright (C) 2000-2006 the VideoLAN team
+ * $Id$
*
- * Authors: Simon Latapie <garf@via.ecp.fr>, Samuel Hocevar <sam@zoy.org>
+ * Authors: Simon Latapie <garf@via.ecp.fr>
+ * Antoine Cellerier <dionoea -at- videolan d0t org>
*
* 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <errno.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <math.h>
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_sout.h>
-#include "filter_common.h"
+#include <vlc_filter.h>
+#include "filter_picture.h"
+#ifndef M_PI
+# define M_PI 3.14159265358979323846
+#endif
#define eight_times( x ) x x x x x x x x
static int Create ( vlc_object_t * );
static void Destroy ( vlc_object_t * );
-static int Init ( vout_thread_t * );
-static void End ( vout_thread_t * );
-static void Render ( vout_thread_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
*****************************************************************************/
-#define CONT_TEXT N_("Contrast")
-#define CONT_LONGTEXT N_("Default to 1")
-#define HUE_TEXT N_("Hue")
-#define HUE_LONGTEXT N_("Between 0 and 360. Default to 0")
-#define SAT_TEXT N_("Saturation")
-#define SAT_LONGTEXT N_("Default to 1")
-#define LUM_TEXT N_("Brightness")
-#define LUM_LONGTEXT N_("Default to 1")
-
-
-vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
- add_float( "Contrast", 1.0, NULL, CONT_TEXT, CONT_LONGTEXT );
- add_float( "Brightness", 1.0, NULL, LUM_TEXT, LUM_LONGTEXT );
- add_integer( "Hue", 0, NULL, HUE_TEXT, HUE_LONGTEXT );
- add_float( "Saturation", 1.0, NULL, SAT_TEXT, SAT_LONGTEXT );
- set_description( _("Contrast/Hue/Saturation/Brightness filter") );
- set_capability( "video filter", 0 );
- add_shortcut( "adjust" );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+#define THRES_TEXT N_("Brightness threshold")
+#define THRES_LONGTEXT N_("When this mode is enabled, pixels will be " \
+ "shown as black or white. The threshold value will be the brighness " \
+ "defined below." )
+#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_("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 ()
+ 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, false )
+ add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL,
+ LUM_TEXT, LUM_LONGTEXT, false )
+ add_integer_with_range( "hue", 0, 0, 360, NULL,
+ HUE_TEXT, HUE_LONGTEXT, false )
+ add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL,
+ SAT_TEXT, SAT_LONGTEXT, false )
+ add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL,
+ GAMMA_TEXT, GAMMA_LONGTEXT, false )
+
+ add_bool( "brightness-threshold", false, NULL,
+ THRES_TEXT, THRES_LONGTEXT, false )
+
+ add_shortcut( "adjust" )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
+
+static const char *const ppsz_filter_options[] = {
+ "contrast", "brightness", "hue", "saturation", "gamma",
+ "brightness-threshold", NULL
+};
/*****************************************************************************
- * vout_sys_t: adjust video output method descriptor
- *****************************************************************************
- * This structure is part of the video output thread descriptor.
- * It describes the adjust specific properties of an output thread.
+ * filter_sys_t: adjust filter method descriptor
*****************************************************************************/
-struct vout_sys_t
+struct filter_sys_t
{
- vout_thread_t *p_vout;
+ vlc_mutex_t lock;
+ double f_contrast;
+ double f_brightness;
+ int i_hue;
+ double f_saturation;
+ double f_gamma;
+ bool b_brightness_threshold;
};
-static int p_lum_func[256];
-
-inline static int32_t maxmin( int32_t a )
-{
- if ( a > 255 )
- return 255;
- else if ( a < 0 )
- return 0;
- else
- return 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 )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys;
- /* Allocate structure */
- p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
- if( p_vout->p_sys == NULL )
+ switch( p_filter->fmt_in.video.i_chroma )
{
- msg_Err( p_vout, "out of memory" );
- return( 1 );
+ 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;
}
- p_vout->pf_init = Init;
- p_vout->pf_end = End;
- p_vout->pf_manage = NULL;
- p_vout->pf_render = Render;
- p_vout->pf_display = NULL;
+ if( p_filter->fmt_in.video.i_chroma != p_filter->fmt_out.video.i_chroma )
+ {
+ msg_Err( p_filter, "Input and output chromas don't match" );
+ return VLC_EGENERIC;
+ }
- return( 0 );
+ /* Allocate structure */
+ p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
+ if( p_filter->p_sys == NULL )
+ return VLC_ENOMEM;
+ p_sys = p_filter->p_sys;
+
+ /* needed to get options passed in transcode using the
+ * adjust{name=value} syntax */
+ config_ChainParse( p_filter, "", ppsz_filter_options,
+ p_filter->p_cfg );
+
+ 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;
}
/*****************************************************************************
- * Init: initialize adjust video thread output method
+ * Destroy: destroy adjust video filter
*****************************************************************************/
-static int Init( vout_thread_t *p_vout )
+static void Destroy( vlc_object_t *p_this )
{
- int i_index;
- picture_t *p_pic;
+ filter_t *p_filter = (filter_t *)p_this;
+ 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 );
+}
- I_OUTPUTPICTURES = 0;
+/*****************************************************************************
+ * Run the filter on a Planar YUV picture
+ *****************************************************************************/
+static picture_t *FilterPlanar( filter_t *p_filter, picture_t *p_pic )
+{
+ int pi_luma[256];
+ int pi_gamma[256];
- /* Initialize the output structure */
- p_vout->output.i_chroma = p_vout->render.i_chroma;
- p_vout->output.i_width = p_vout->render.i_width;
- p_vout->output.i_height = p_vout->render.i_height;
- p_vout->output.i_aspect = p_vout->render.i_aspect;
+ picture_t *p_outpic;
+ uint8_t *p_in, *p_in_v, *p_in_end, *p_line_end;
+ uint8_t *p_out, *p_out_v;
+
+ 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;
- /* Try to open the real video output */
- msg_Dbg( p_vout, "spawning the real video output" );
+ if( !p_pic ) return NULL;
- p_vout->p_sys->p_vout = vout_Create( p_vout,
- p_vout->render.i_width, p_vout->render.i_height,
- p_vout->render.i_chroma, p_vout->render.i_aspect );
+ p_outpic = filter_NewPicture( p_filter );
+ if( !p_outpic )
+ {
+ picture_Release( p_pic );
+ return NULL;
+ }
- /* Everything failed */
- if( p_vout->p_sys->p_vout == 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 )
{
- msg_Err( p_vout, "can't open vout, aborting" );
- return( 0 );
+ /* 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)];
+ }
}
-
- ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
+ 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;
+ }
- return( 0 );
-}
+ /*
+ * Desaturates image to avoid that strange yellow halo...
+ */
+ i_sat = 0;
+ }
-/*****************************************************************************
- * End: terminate adjust video thread output method
- *****************************************************************************/
-static void End( vout_thread_t *p_vout )
-{
- int i_index;
+ /*
+ * Do the Y plane
+ */
+
+ p_in = p_pic->p[Y_PLANE].p_pixels;
+ p_in_end = p_in + p_pic->p[Y_PLANE].i_visible_lines
+ * p_pic->p[Y_PLANE].i_pitch - 8;
+
+ p_out = p_outpic->p[Y_PLANE].p_pixels;
- /* Free the fake output buffers we allocated */
- for( i_index = I_OUTPUTPICTURES ; i_index ; )
+ for( ; p_in < p_in_end ; )
{
- i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
+ p_line_end = p_in + p_pic->p[Y_PLANE].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_line_end += 8;
+
+ for( ; p_in < p_line_end ; )
+ {
+ *p_out++ = pi_luma[ *p_in++ ];
+ }
+
+ p_in += p_pic->p[Y_PLANE].i_pitch
+ - p_pic->p[Y_PLANE].i_visible_pitch;
+ p_out += p_outpic->p[Y_PLANE].i_pitch
+ - p_outpic->p[Y_PLANE].i_visible_pitch;
}
-}
-/*****************************************************************************
- * Destroy: destroy adjust video thread output method
- *****************************************************************************
- * Terminate an output method created by adjustCreateOutputMethod
- *****************************************************************************/
-static void Destroy( vlc_object_t *p_this )
-{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
+ /*
+ * Do the U and V planes
+ */
+
+ p_in = p_pic->p[U_PLANE].p_pixels;
+ p_in_v = p_pic->p[V_PLANE].p_pixels;
+ p_in_end = p_in + p_pic->p[U_PLANE].i_visible_lines
+ * p_pic->p[U_PLANE].i_pitch - 8;
- vout_Destroy( p_vout->p_sys->p_vout );
+ p_out = p_outpic->p[U_PLANE].p_pixels;
+ p_out_v = p_outpic->p[V_PLANE].p_pixels;
- free( p_vout->p_sys );
+ 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++ ; i_v = *p_in_v++ ; \
+ *p_out++ = clip_uint8_vlc( (( ((i_u * i_cos + i_v * i_sin - i_x) >> 8) \
+ * i_sat) >> 8) + 128); \
+ *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;
+
+ for( ; p_in < p_in_end ; )
+ {
+ p_line_end = p_in + p_pic->p[U_PLANE].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[U_PLANE].i_pitch
+ - p_pic->p[U_PLANE].i_visible_pitch;
+ p_in_v += p_pic->p[V_PLANE].i_pitch
+ - p_pic->p[V_PLANE].i_visible_pitch;
+ p_out += p_outpic->p[U_PLANE].i_pitch
+ - p_outpic->p[U_PLANE].i_visible_pitch;
+ p_out_v += p_outpic->p[V_PLANE].i_pitch
+ - p_outpic->p[V_PLANE].i_visible_pitch;
+ }
+#undef WRITE_UV_CLIP
+ }
+ else
+ {
+#define WRITE_UV() \
+ 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 < p_in_end ; )
+ {
+ p_line_end = p_in + p_pic->p[U_PLANE].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[U_PLANE].i_pitch
+ - p_pic->p[U_PLANE].i_visible_pitch;
+ p_in_v += p_pic->p[V_PLANE].i_pitch
+ - p_pic->p[V_PLANE].i_visible_pitch;
+ p_out += p_outpic->p[U_PLANE].i_pitch
+ - p_outpic->p[U_PLANE].i_visible_pitch;
+ 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 );
}
/*****************************************************************************
- * 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 Packed YUV picture
*****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_pic )
+static picture_t *FilterPacked( filter_t *p_filter, picture_t *p_pic )
{
+ int pi_luma[256];
+ int pi_gamma[256];
+
picture_t *p_outpic;
- int i_index;
- s32 cont;
- s32 lum;
-
- /* Contrast is a fast but cludged function, so I put this gap to be
-cleaner :) */
- s32 dec;
-
- double hue;
- int i_sat;
- int i_Sin;
- int i_Cos;
+ 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;
-
- /* This is a new frame. Get a structure from the video_output. */
-
- cont = (s32) ( config_GetFloat( p_vout, "Contrast" ) * 255 );
- lum = (s32) ( ( config_GetFloat( p_vout, "Brightness" ) * 255 ) - 255 );
- hue = config_GetInt( p_vout, "Hue" ) * 3.14159 / 180 ; /* convert in radian */
- i_sat = (int) ( config_GetFloat( p_vout, "Saturation" ) * 256 );
-
- dec = 128 - ( cont / 2 );
- i_Sin = (int) ( sin(hue) * 256);
- i_Cos = (int) ( cos(hue) * 256);
-
-
- while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) )
- == NULL )
- {
- if( p_vout->b_die || p_vout->b_error )
- {
- return;
- }
- msleep( VOUT_OUTMEM_SLEEP );
- }
- vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
- vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic );
+ 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;
- for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
+ 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) );
- if ( i_index==0 )
+ picture_Release( p_pic );
+ return NULL;
+ }
+
+ p_outpic = filter_NewPicture( p_filter );
+ if( !p_outpic )
{
+ msg_Warn( p_filter, "can't get output picture" );
- u8 *p_in, *p_in_end, *p_out;
+ 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 )
+ {
- p_in = p_pic->p[i_index].p_pixels;
- p_in_end = p_in + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch -8;
-
- p_out = p_outpic->p[i_index].p_pixels;
+ /* 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++ )
{
- p_lum_func[ i ] = maxmin( (( i * cont ) >> 8 ) + lum + dec );
+ pi_gamma[ i ] = clip_uint8_vlc( pow(i / 255.0, f_gamma) * 255.0);
}
-
- for( ; p_in < p_in_end ; )
+ /* Fill the luma lookup table */
+ for( i = 0 ; i < 256 ; i++ )
{
- /* Do 8 pixels at a time */
+ 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;
+ }
- eight_times( *p_out = p_lum_func[ *p_in ]; p_out++; p_in++; )
+ /*
+ * 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_in_end += 8;
+ p_line_end += 8 * 4;
- for( ; p_in < p_in_end ; )
+ for( ; p_in < p_line_end ; )
{
- /* Do 1 pixel at a time */
- *p_out = p_lum_func[ *p_in ]; p_out++; p_in++;
+ *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;
}
- else
- {
- if ( i_index==1 )
- {
- u8 *p_in_u, *p_in_v, *p_in_end, *p_out_u, *p_out_v, i_u, i_v;
- s32 cospsin, cosmsin;
+ /*
+ * Do the U and V planes
+ */
- p_in_u = p_pic->p[i_index].p_pixels;
- p_in_v = p_pic->p[i_index + 1].p_pixels;
- p_in_end = p_in_u + p_pic->p[i_index].i_lines
- * p_pic->p[i_index].i_pitch -8;
-
- p_out_u = p_outpic->p[i_index].p_pixels;
- p_out_v = p_outpic->p[i_index + 1].p_pixels;
+ 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;
- cospsin = 128 * ( i_Cos + i_Sin );
- cosmsin = 128 * ( i_Cos - i_Sin );
+ p_out = p_outpic->p->p_pixels + i_u_offset;
+ p_out_v = p_outpic->p->p_pixels + i_v_offset;
- if ( i_sat > 256 )
- {
- for( ; p_in_u < p_in_end ; )
- {
- /* Do 8 pixels at a time */
+ i_sin = sin(f_hue) * 256;
+ i_cos = cos(f_hue) * 256;
- eight_times( i_u = *p_in_u ;
- i_v = *p_in_v ;
- *p_out_u = maxmin( (( ((i_u * i_Cos + i_v * i_Sin - cospsin) >> 8) * i_sat) >> 8) + 128);
- *p_out_v = maxmin( (( ((i_v * i_Cos - i_u * i_Sin - cosmsin) >> 8) * i_sat) >> 8) + 128);
- p_out_u++; p_in_u++; p_out_v++; p_in_v++; )
+ 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;
- p_in_end += 8;
+ for( ; p_in < p_in_end ; )
+ {
+ p_line_end = p_in + i_visible_pitch - 8 * 4;
- for( ; p_in_u < p_in_end ; )
+ for( ; p_in < p_line_end ; )
{
- /* Do 1 pixel at a time */
- i_u = *p_in_u ;
- i_v = *p_in_v ;
- *p_out_u = maxmin( (( ((i_u * i_Cos + i_v * i_Sin - cospsin) >> 8) * i_sat) >> 8) + 128);
- *p_out_v = maxmin( (( ((i_v * i_Cos - i_u * i_Sin - cosmsin) >> 8) * i_sat) >> 8) + 128);
- p_out_u++; p_in_u++; p_out_v++; p_in_v++;
+ /* 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;
}
- else
+#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 ; )
{
- for( ; p_in_u < 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 */
-
- eight_times( i_u = *p_in_u ;
- i_v = *p_in_v ;
- *p_out_u = (( ((i_u * i_Cos + i_v * i_Sin - cospsin) >> 8) * i_sat) >> 8) + 128;
- *p_out_v = (( ((i_v * i_Cos - i_u * i_Sin - cosmsin) >> 8) * i_sat) >> 8) + 128;
- p_out_u++; p_in_u++; p_out_v++; p_in_v++; )
-
+ WRITE_UV(); WRITE_UV(); WRITE_UV(); WRITE_UV();
+ WRITE_UV(); WRITE_UV(); WRITE_UV(); WRITE_UV();
}
- p_in_end += 8;
+ p_line_end += 8 * 4;
- for( ; p_in_u < p_in_end ; )
+ for( ; p_in < p_line_end ; )
{
- /* Do 1 pixel at a time */
- i_u = *p_in_u ;
- i_v = *p_in_v ;
- *p_out_u = (( ((i_u * i_Cos + i_v * i_Sin - cospsin) >> 8) * i_sat) >> 8) + 128;
- *p_out_v = (( ((i_v * i_Cos - i_u * i_Sin - cosmsin) >> 8) * i_sat) >> 8) + 128;
- p_out_u++; p_in_u++; p_out_v++; p_in_v++;
-
+ 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
}
- vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
+ return CopyInfoAndRelease( p_outpic, p_pic );
+}
- vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
+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;
}
projects / vlc / blobdiff