/*****************************************************************************
* erase.c : logo erase video filter
*****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Antoine Cellerier <dionoea -at- videolan -dot- 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
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 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
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_sout.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"
/*****************************************************************************
#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( 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, 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_loadfile( CFG_PREFIX "mask", NULL,
+ MASK_TEXT, MASK_LONGTEXT, false )
+ add_integer( CFG_PREFIX "x", 0, POSX_TEXT, POSX_LONGTEXT, false )
+ add_integer( CFG_PREFIX "y", 0, POSY_TEXT, POSY_LONGTEXT, false )
add_shortcut( "erase" )
set_callbacks( Create, Destroy )
memset( &fmt_out, 0, sizeof( video_format_t ) );
fmt_out.i_chroma = VLC_CODEC_YUVA;
p_image = image_HandlerCreate( p_filter );
+ char *psz_url = vlc_path2uri( 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_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 );
}
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;
}
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" );
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;
return NULL;
}
- /* Here */
- FilterErase( p_filter, p_pic, p_outpic );
+ /* 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 CopyInfoAndRelease( p_outpic, p_pic );
}
{
filter_sys_t *p_sys = p_filter->p_sys;
- vlc_mutex_lock( &p_sys->lock );
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( 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;
i_width = __MIN( i_visible_pitch - i_x, i_width );
/* Copy original pixel buffer */
- vlc_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;
+ uint8_t *p_outpix = p_outpic->p[i_plane].p_pixels + i_y*i_pitch + i_x;
for( y = 0; y < i_height;
y++, p_mask += i_mask_pitch, p_outpix += i_pitch )
{
}
}
}
- vlc_mutex_unlock( &p_sys->lock );
}
static int EraseCallback( vlc_object_t *p_this, char const *psz_var,