* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_sout.h>
-#include <vlc_vout.h>
-#include "vlc_image.h"
+#include <vlc_image.h>
-#include "vlc_filter.h"
+#include <vlc_filter.h>
+#include <vlc_url.h>
+#include "filter_picture.h"
/*****************************************************************************
* Local prototypes
#define POSY_TEXT N_("Y coordinate")
#define POSY_LONGTEXT N_("Y coordinate of the mask.")
+#define ERASE_HELP N_("Remove zones of the video using a picture as mask")
+
#define CFG_PREFIX "erase-"
-vlc_module_begin();
- set_description( _("Erase video filter") );
- set_shortname( _( "Erase" ));
- set_capability( "video filter2", 0 );
- set_category( CAT_VIDEO );
- set_subcategory( SUBCAT_VIDEO_VFILTER );
+vlc_module_begin ()
+ set_description( N_("Erase video filter") )
+ set_shortname( N_( "Erase" ))
+ set_capability( "video filter2", 0 )
+ set_help(ERASE_HELP)
+ set_category( CAT_VIDEO )
+ set_subcategory( SUBCAT_VIDEO_VFILTER )
add_file( CFG_PREFIX "mask", NULL, NULL,
- MASK_TEXT, MASK_LONGTEXT, VLC_FALSE );
- add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
- add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
+ MASK_TEXT, MASK_LONGTEXT, false )
+ add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, false )
+ add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, false )
- add_shortcut( "erase" );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+ add_shortcut( "erase" )
+ set_callbacks( Create, Destroy )
+vlc_module_end ()
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"mask", "x", "y", NULL
};
picture_t *p_old_mask = p_filter->p_sys->p_mask;
memset( &fmt_in, 0, sizeof( video_format_t ) );
memset( &fmt_out, 0, sizeof( video_format_t ) );
- fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A');
+ fmt_out.i_chroma = VLC_CODEC_YUVA;
p_image = image_HandlerCreate( p_filter );
+ char *psz_url = make_URI( psz_filename, NULL );
p_filter->p_sys->p_mask =
- image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out );
+ image_ReadUrl( p_image, psz_url, &fmt_in, &fmt_out );
+ free( psz_url );
if( p_filter->p_sys->p_mask )
{
if( p_old_mask )
- p_old_mask->pf_release( p_old_mask );
+ picture_Release( p_old_mask );
}
else if( p_old_mask )
{
p_filter->p_sys->p_mask = p_old_mask;
msg_Err( p_filter, "Error while loading new mask. Keeping old mask." );
}
+ else
+ msg_Err( p_filter, "Error while loading new mask. No mask available." );
+
image_HandlerDelete( p_image );
}
switch( p_filter->fmt_in.video.i_chroma )
{
- case VLC_FOURCC('I','4','2','0'):
- case VLC_FOURCC('I','Y','U','V'):
- case VLC_FOURCC('J','4','2','0'):
- case VLC_FOURCC('Y','V','1','2'):
+ case VLC_CODEC_I420:
+ case VLC_CODEC_J420:
+ case VLC_CODEC_YV12:
- case VLC_FOURCC('I','4','2','2'):
- case VLC_FOURCC('J','4','2','2'):
+ case VLC_CODEC_I422:
+ case VLC_CODEC_J422:
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;
}
/* 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;
p_filter->pf_video_filter = Filter;
if( !psz_filename )
{
msg_Err( p_filter, "Missing 'mask' option value." );
+ free( p_sys );
return VLC_EGENERIC;
}
p_sys->p_mask = NULL;
LoadMask( p_filter, psz_filename );
free( psz_filename );
+
p_sys->i_x = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "x" );
p_sys->i_y = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX "y" );
+ vlc_mutex_init( &p_sys->lock );
var_AddCallback( p_filter, CFG_PREFIX "x", EraseCallback, p_sys );
var_AddCallback( p_filter, CFG_PREFIX "y", EraseCallback, p_sys );
var_AddCallback( p_filter, CFG_PREFIX "mask", EraseCallback, p_sys );
- vlc_mutex_init( p_filter, &p_sys->lock );
-
return VLC_SUCCESS;
}
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys = p_filter->p_sys;
if( p_sys->p_mask )
- p_sys->p_mask->pf_release( p_sys->p_mask );
+ picture_Release( p_sys->p_mask );
+ var_DelCallback( p_filter, CFG_PREFIX "x", EraseCallback, p_sys );
+ var_DelCallback( p_filter, CFG_PREFIX "y", EraseCallback, p_sys );
+ var_DelCallback( p_filter, CFG_PREFIX "mask", EraseCallback, p_sys );
vlc_mutex_destroy( &p_sys->lock );
free( p_filter->p_sys );
static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
picture_t *p_outpic;
+ 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;
}
- /* Here */
- FilterErase( p_filter, p_pic, p_outpic );
-
- 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 );
+ /* If the mask is empty: just copy the image */
+ vlc_mutex_lock( &p_sys->lock );
+ if( p_sys->p_mask )
+ FilterErase( p_filter, p_pic, p_outpic );
+ else
+ picture_CopyPixels( p_outpic, p_pic );
+ vlc_mutex_unlock( &p_sys->lock );
- return p_outpic;
+ return CopyInfoAndRelease( p_outpic, p_pic );
}
/*****************************************************************************
{
filter_sys_t *p_sys = p_filter->p_sys;
- int i_plane;
-
const int i_mask_pitch = p_sys->p_mask->A_PITCH;
const int i_mask_visible_pitch = p_sys->p_mask->p[A_PLANE].i_visible_pitch;
const int i_mask_visible_lines = p_sys->p_mask->p[A_PLANE].i_visible_lines;
- for( i_plane = 0; i_plane < p_inpic->i_planes; i_plane++ )
+ for( int i_plane = 0; i_plane < p_inpic->i_planes; i_plane++ )
{
- const int i_pitch = p_inpic->p[i_plane].i_pitch;
+ const int i_pitch = p_outpic->p[i_plane].i_pitch;
const int i_2pitch = i_pitch<<1;
const int i_visible_pitch = p_inpic->p[i_plane].i_visible_pitch;
- const int i_lines = p_inpic->p[i_plane].i_lines;
const int i_visible_lines = p_inpic->p[i_plane].i_visible_lines;
- uint8_t *p_inpix = p_inpic->p[i_plane].p_pixels;
uint8_t *p_outpix = p_outpic->p[i_plane].p_pixels;
uint8_t *p_mask = p_sys->p_mask->A_PIXELS;
+ int i_x = p_sys->i_x, i_y = p_sys->i_y;
- int i_x = p_sys->i_x,
- i_y = p_sys->i_y;
int x, y;
int i_height = i_mask_visible_lines;
int i_width = i_mask_visible_pitch;
- const vlc_bool_t b_line_factor = ( i_plane /* U_PLANE or V_PLANE */ &&
- !( p_inpic->format.i_chroma == VLC_FOURCC('I','4','2','2')
- || p_inpic->format.i_chroma == VLC_FOURCC('J','4','2','2') ) );
+ const bool b_line_factor = ( i_plane /* U_PLANE or V_PLANE */ &&
+ !( p_inpic->format.i_chroma == VLC_CODEC_I422
+ || p_inpic->format.i_chroma == VLC_CODEC_J422 ) );
if( i_plane ) /* U_PLANE or V_PLANE */
{
i_width = __MIN( i_visible_pitch - i_x, i_width );
/* Copy original pixel buffer */
- p_filter->p_libvlc->pf_memcpy( p_outpix, p_inpix, i_pitch * i_lines );
+ plane_CopyPixels( &p_outpic->p[i_plane], &p_inpic->p[i_plane] );
/* Horizontal linear interpolation of masked areas */
p_outpix = p_outpic->p[i_plane].p_pixels + i_y*i_pitch + i_x;
static int EraseCallback( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(oldval);
filter_sys_t *p_sys = (filter_sys_t *)p_data;
if( !strcmp( psz_var, CFG_PREFIX "x" ) )
projects / vlc / blobdiff