N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
vlc_module_begin();
- set_description( N_("Logo video filter") );
- set_capability( "video filter", 0 );
+ set_capability( "sub filter", 0 );
+ set_callbacks( CreateFilter, DestroyFilter );
+ set_description( N_("Logo sub filter") );
set_shortname( N_("Logo overlay") );
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_SUBPIC );
add_shortcut( "logo" );
- set_callbacks( Create, Destroy );
add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, false );
add_integer( CFG_PREFIX "x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, true );
add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
TRANS_TEXT, TRANS_LONGTEXT, false );
add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false );
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL );
- /* subpicture filter submodule */
+ /* video output filter submodule */
add_submodule();
- set_capability( "sub filter", 0 );
- set_callbacks( CreateFilter, DestroyFilter );
- set_description( N_("Logo sub filter") );
+ set_capability( "video filter", 0 );
+ set_callbacks( Create, Destroy );
+ set_description( N_("Logo video filter") );
vlc_module_end();
static const char *const ppsz_filter_options[] = {
FREENULL( p_logo->psz_file );
if( p_logo->p_pic )
{
- p_logo->p_pic->pf_release( p_logo->p_pic );
+ picture_Release( p_logo->p_pic );
p_logo->p_pic = NULL;
}
}
if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
{
msg_Err( p_vout, "logo file not specified" );
+ free( p_logo_list->psz_filename );
+ free( p_sys );
return VLC_EGENERIC;
}
p_vout->output.i_height;
p_sys->p_blend->p_module =
- module_Need( p_sys->p_blend, "video blending", 0, 0 );
+ module_need( p_sys->p_blend, "video blending", 0, 0 );
if( !p_sys->p_blend->p_module )
{
msg_Err( p_vout, "can't open blending filter, aborting" );
var_DelCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
var_DelCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
- vout_Destroy( p_sys->p_vout );
+ vout_CloseAndRelease( p_sys->p_vout );
if( p_sys->p_blend->p_module )
- module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );
+ module_unneed( p_sys->p_blend, p_sys->p_blend->p_module );
vlc_object_detach( p_sys->p_blend );
vlc_object_release( p_sys->p_blend );
}
msleep( VOUT_OUTMEM_SLEEP );
}
- vout_CopyPicture( p_vout, p_outpic, p_inpic );
- vout_DatePicture( p_sys->p_vout, p_outpic, p_inpic->date );
+ picture_Copy( p_outpic, p_inpic );
if( p_pic )
- p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic, p_outpic,
- p_pic, p_sys->posx, p_sys->posy,
- p_logo->i_alpha != -1 ? p_logo->i_alpha
- : p_logo_list->i_alpha );
+ p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic,
+ p_pic, p_sys->posx, p_sys->posy,
+ p_logo->i_alpha != -1 ? p_logo->i_alpha
+ : p_logo_list->i_alpha );
vout_DisplayPicture( p_sys->p_vout, p_outpic );
}
p_pic = p_logo->p_pic;
/* Allocate the subpicture internal data. */
- p_spu = p_filter->pf_sub_buffer_new( p_filter );
+ p_spu = filter_NewSubpicture( p_filter );
if( !p_spu )
{
vlc_mutex_unlock( &p_logo_list->lock );
fmt.i_width = fmt.i_visible_width = p_pic->p[Y_PLANE].i_visible_pitch;
fmt.i_height = fmt.i_visible_height = p_pic->p[Y_PLANE].i_visible_lines;
fmt.i_x_offset = fmt.i_y_offset = 0;
- p_region = p_spu->pf_create_region( VLC_OBJECT(p_filter), &fmt );
+ p_region = subpicture_region_New( &fmt );
if( !p_region )
{
msg_Err( p_filter, "cannot allocate SPU region" );
return NULL;
}
- vout_CopyPicture( p_filter, &p_region->picture, p_pic );
+ /* FIXME the copy is probably not needed anymore */
+ picture_Copy( p_region->p_picture, p_pic );
vlc_mutex_unlock( &p_logo_list->lock );
/* where to locate the logo: */
p_spu->b_absolute = false;
}
- p_spu->i_x = p_sys->posx;
- p_spu->i_y = p_sys->posy;
+ p_region->i_x = p_sys->posx;
+ p_region->i_y = p_sys->posy;
p_spu->p_region = p_region;