#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 "filter_picture.h"
/*****************************************************************************
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 );
}
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;
}
}
}
- vlc_mutex_unlock( &p_sys->lock );
}
static int EraseCallback( vlc_object_t *p_this, char const *psz_var,