/*****************************************************************************
* Preamble
*****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <errno.h>
#include <math.h>
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
#include <vlc_vout.h>
#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( _("Image adjust" ));
+ 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 );
- change_safe();
+ CONT_TEXT, CONT_LONGTEXT, false );
add_float_with_range( "brightness", 1.0, 0.0, 2.0, NULL,
- LUM_TEXT, LUM_LONGTEXT, VLC_FALSE );
- change_safe();
+ LUM_TEXT, LUM_LONGTEXT, false );
add_integer_with_range( "hue", 0, 0, 360, NULL,
- HUE_TEXT, HUE_LONGTEXT, VLC_FALSE );
- change_safe();
+ HUE_TEXT, HUE_LONGTEXT, false );
add_float_with_range( "saturation", 1.0, 0.0, 3.0, NULL,
- SAT_TEXT, SAT_LONGTEXT, VLC_FALSE );
- change_safe();
+ SAT_TEXT, SAT_LONGTEXT, false );
add_float_with_range( "gamma", 1.0, 0.01, 10.0, NULL,
- GAMMA_TEXT, GAMMA_LONGTEXT, VLC_FALSE );
- change_safe();
+ GAMMA_TEXT, GAMMA_LONGTEXT, false );
add_bool( "brightness-threshold", 0, NULL,
- THRES_TEXT, THRES_LONGTEXT, VLC_FALSE );
- change_safe();
+ THRES_TEXT, THRES_LONGTEXT, false );
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
};
int i_hue;
double f_saturation;
double f_gamma;
- vlc_bool_t b_brightness_threshold;
+ bool b_brightness_threshold;
};
/*****************************************************************************
/* 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_sys = p_filter->p_sys;
/* needed to get options passed in transcode using the
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;
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;
}
/*
* 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
#undef WRITE_UV
}
- 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;
-
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
-
- return p_outpic;
+ return CopyInfoAndRelease( p_outpic, p_pic );
}
/*****************************************************************************
int i_lines, i_visible_lines, i_pitch, i_visible_pitch;
- vlc_bool_t b_thres;
+ bool b_thres;
double f_hue;
double f_gamma;
int32_t i_cont, i_lum;
{
msg_Warn( p_filter, "Unsupported input chroma (%4s)",
(char*)&(p_pic->format.i_chroma) );
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
+
+ picture_Release( p_pic );
return NULL;
}
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;
}
/*
* 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
#undef WRITE_UV
}
- 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;
-
- if( p_pic->pf_release )
- p_pic->pf_release( p_pic );
-
- return p_outpic;
+ 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;
if( !strcmp( psz_var, "contrast" ) )