/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_vout.h>
#include "vlc_filter.h"
#include "filter_common.h"
"(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
"also use combinations of these values, eg 6 = top-right).")
-static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static char *ppsz_pos_descriptions[] =
+#define CFG_PREFIX "logo-"
+
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
vlc_module_begin();
- set_description( _("Logo video filter") );
+ set_description( N_("Logo video filter") );
set_capability( "video filter", 0 );
set_shortname( N_("Logo overlay") );
set_category( CAT_VIDEO );
add_shortcut( "logo" );
set_callbacks( Create, Destroy );
- add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE );
- add_integer( "logo-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
- add_integer( "logo-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
+ 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( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, true );
/* default to 1000 ms per image, continuously cycle through them */
- add_integer( "logo-delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, VLC_TRUE );
- add_integer( "logo-repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE );
- add_integer_with_range( "logo-transparency", 255, 0, 255, NULL,
- TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
- add_integer( "logo-position", 6, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE );
+ add_integer( CFG_PREFIX "delay", 1000, NULL, DELAY_TEXT, DELAY_LONGTEXT, true );
+ add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_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 );
/* subpicture filter submodule */
add_submodule();
set_capability( "sub filter", 0 );
set_callbacks( CreateFilter, DestroyFilter );
- set_description( _("Logo sub filter") );
- add_shortcut( "logo" );
+ set_description( N_("Logo sub filter") );
vlc_module_end();
+static const char *const ppsz_filter_options[] = {
+ "file", "x", "y", "delay", "repeat", "transparency", "position", NULL
+};
+
/*****************************************************************************
* Structure to hold the set of individual logo image names, times,
* transparencies
{
picture_t *p_pic;
image_handler_t *p_image;
- video_format_t fmt_in = {0}, fmt_out = {0};
+ video_format_t fmt_in;
+ video_format_t fmt_out;
+
+ 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');
p_image = image_HandlerCreate( p_this );
* logo-transparency values.
*****************************************************************************/
#define LoadLogoList( a, b ) __LoadLogoList( VLC_OBJECT( a ), b )
-void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list )
+static void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list )
{
char *psz_list; /* the list: <logo>[,[<delay>[,[<alpha>]]]][;...] */
unsigned int i;
/*****************************************************************************
* FreeLogoList
*****************************************************************************/
-void FreeLogoList( logo_list_t *p_logo_list )
+static void FreeLogoList( logo_list_t *p_logo_list )
{
unsigned int i;
FREENULL( p_logo_list->psz_filename );
for( i = 0; i < p_logo_list->i_count; i++ )
{
logo_t *p_logo = &p_logo_list->p_logo[i];
- FREENULL( p_logo[i].psz_file );
- if( p_logo[i].p_pic )
+ FREENULL( p_logo->psz_file );
+ if( p_logo->p_pic )
{
- p_logo[i].p_pic->pf_release( p_logo[i].p_pic );
- p_logo[i].p_pic = NULL;
+ picture_Release( p_logo->p_pic );
+ p_logo->p_pic = NULL;
}
}
}
{
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_sys_t *p_sys;
- vlc_value_t val;
logo_list_t *p_logo_list;
/* Allocate structure */
p_sys = p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
- }
p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
if( p_logo_list == NULL )
{
- msg_Err( p_vout, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
+ config_ChainParse( p_vout, CFG_PREFIX, ppsz_filter_options,
+ p_vout->p_cfg );
+
+ p_logo_list->psz_filename = var_CreateGetStringCommand( p_vout,
+ "logo-file" );
+ 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->pf_init = Init;
p_vout->pf_end = End;
p_vout->pf_manage = NULL;
p_vout->pf_display = NULL;
p_vout->pf_control = Control;
- p_logo_list->psz_filename = var_CreateGetString( p_this , "logo-file" );
- if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
- {
- msg_Err( p_this, "logo file not specified" );
- return 0;
- }
-
- var_Create( p_this, "logo-position", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "logo-position", &val );
- p_sys->pos = val.i_int;
-
- var_Create( p_this, "logo-x", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "logo-x", &val );
- p_sys->posx = val.i_int;
-
- var_Create( p_this, "logo-y", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "logo-y", &val );
- p_sys->posy = val.i_int;
-
- var_Create( p_this, "logo-delay", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "logo-delay", &val );
- p_logo_list->i_delay = __MAX( __MIN( val.i_int, 60000 ), 0 );
-
- var_Create( p_this, "logo-repeat", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
- var_Get( p_this, "logo-repeat", &val );
- p_logo_list->i_repeat = val.i_int;
-
- var_Create(p_this, "logo-transparency", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT);
- var_Get( p_this, "logo-transparency", &val );
- p_logo_list->i_alpha = __MAX( __MIN( val.i_int, 255 ), 0 );
+ p_sys->pos = var_CreateGetIntegerCommand( p_vout, "logo-position" );
+ p_sys->posx = var_CreateGetIntegerCommand( p_vout, "logo-x" );
+ p_sys->posy = var_CreateGetIntegerCommand( p_vout, "logo-y" );
+ p_logo_list->i_delay = __MAX( __MIN(
+ var_CreateGetIntegerCommand( p_vout, "logo-delay" ) , 60000 ), 0 );
+ p_logo_list->i_repeat = var_CreateGetIntegerCommand( p_vout, "logo-repeat");
+ p_logo_list->i_alpha = __MAX( __MIN(
+ var_CreateGetIntegerCommand( p_vout, "logo-transparency" ), 255 ), 0 );
LoadLogoList( p_vout, p_logo_list );
vout_sys_t *p_sys = p_vout->p_sys;
picture_t *p_pic;
int i_index;
- video_format_t fmt = {0};
-
+ video_format_t fmt;
logo_list_t *p_logo_list = p_sys->p_logo_list;
I_OUTPUTPICTURES = 0;
+ memset( &fmt, 0, sizeof(video_format_t) );
/* adjust index to the next logo */
p_logo_list->i_counter =
{
msg_Err( p_vout, "can't open blending filter, aborting" );
vlc_object_detach( p_sys->p_blend );
- vlc_object_destroy( p_sys->p_blend );
+ vlc_object_release( p_sys->p_blend );
return VLC_EGENERIC;
}
p_sys->posx = p_vout->render.i_width / 2 - p_sys->i_width / 2;
}
}
+ else
+ {
+ p_sys->pos = 0;
+ }
/* Try to open the real video output */
msg_Dbg( p_vout, "spawning the real video output" );
vout_sys_t *p_sys = p_vout->p_sys;
int i_index;
+ DEL_PARENT_CALLBACKS( SendEventsToChild );
+
+ DEL_CALLBACKS( p_sys->p_vout, SendEvents );
+
/* Free the fake output buffers we allocated */
for( i_index = I_OUTPUTPICTURES ; i_index ; )
{
var_DelCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
var_DelCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
- if( p_sys->p_vout )
- {
- DEL_CALLBACKS( p_sys->p_vout, SendEvents );
- vlc_object_detach( p_sys->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 );
vlc_object_detach( p_sys->p_blend );
- vlc_object_destroy( p_sys->p_blend );
+ vlc_object_release( p_sys->p_blend );
}
/*****************************************************************************
vout_thread_t *p_vout = (vout_thread_t *)p_this;
vout_sys_t *p_sys = p_vout->p_sys;
- DEL_PARENT_CALLBACKS( SendEventsToChild );
FreeLogoList( p_sys->p_logo_list );
free( p_sys->p_logo_list );
p_sys->p_blend->fmt_in.video.i_visible_height =
p_pic->p[Y_PLANE].i_visible_lines;
- /* Just in case the new image would overflow the vout */
- if( (unsigned int)(p_sys->posy + p_sys->i_height)
- > p_vout->render.i_height
- || (unsigned int)(p_sys->posx + p_sys->i_width)
- > p_vout->render.i_width
- || p_sys->pos )
+ if( p_sys->pos )
{
if( p_sys->pos & SUBPICTURE_ALIGN_BOTTOM )
{
{
p_sys->posy = p_vout->render.i_height/2 - p_sys->i_height/2;
}
-
if( p_sys->pos & SUBPICTURE_ALIGN_RIGHT )
{
p_sys->posx = p_vout->render.i_width - p_sys->i_width;
/* This is a new frame. Get a structure from the video_output. */
while( !(p_outpic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 )) )
{
- if( p_vout->b_die || p_vout->b_error ) return;
+ if( !vlc_object_alive (p_vout) || p_vout->b_error ) return;
msleep( VOUT_OUTMEM_SLEEP );
}
static int SendEvents( 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);
var_Set( (vlc_object_t *)p_data, psz_var, newval );
return VLC_SUCCESS;
}
static int MouseEvent( 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);
vout_thread_t *p_vout = (vout_thread_t*)p_data;
vout_sys_t *p_sys = p_vout->p_sys;
vlc_value_t valb;
static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
+ VLC_UNUSED(p_data); VLC_UNUSED(oldval);
vout_thread_t *p_vout = (vout_thread_t *)p_this;
var_Set( p_vout->p_sys->p_vout, psz_var, newval );
return VLC_SUCCESS;
int pos, posx, posy;
- vlc_bool_t b_absolute;
+ bool b_absolute;
mtime_t i_last_date;
/* On the fly control variable */
- vlc_bool_t b_need_update;
+ bool b_need_update;
};
static subpicture_t *Filter( filter_t *, mtime_t );
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_sys == NULL )
- {
- msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
- }
p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
if( p_logo_list == NULL )
{
- msg_Err( p_filter, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
+ config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
+ p_filter->p_cfg );
+
/* Hook used for callback variables */
p_logo_list->psz_filename =
- var_CreateGetString( p_filter->p_libvlc , "logo-file" );
+ var_CreateGetStringCommand( p_filter, "logo-file" );
if( !p_logo_list->psz_filename || !*p_logo_list->psz_filename )
{
msg_Err( p_this, "logo file not specified" );
return VLC_EGENERIC;
}
- p_sys->posx = var_CreateGetInteger( p_filter->p_libvlc , "logo-x" );
- p_sys->posy = var_CreateGetInteger( p_filter->p_libvlc , "logo-y" );
- p_sys->pos = var_CreateGetInteger( p_filter->p_libvlc , "logo-position" );
- p_logo_list->i_alpha = __MAX( __MIN( var_CreateGetInteger(
- p_filter->p_libvlc, "logo-transparency"), 255 ), 0 );
+ p_sys->posx = var_CreateGetIntegerCommand( p_filter, "logo-x" );
+ p_sys->posy = var_CreateGetIntegerCommand( p_filter, "logo-y" );
+ p_sys->pos = var_CreateGetIntegerCommand( p_filter, "logo-position" );
+ p_logo_list->i_alpha = __MAX( __MIN( var_CreateGetIntegerCommand(
+ p_filter, "logo-transparency"), 255 ), 0 );
p_logo_list->i_delay =
- var_CreateGetInteger( p_filter->p_libvlc , "logo-delay" );
+ var_CreateGetIntegerCommand( p_filter, "logo-delay" );
p_logo_list->i_repeat =
- var_CreateGetInteger( p_filter->p_libvlc , "logo-repeat" );
+ var_CreateGetIntegerCommand( p_filter, "logo-repeat" );
- var_AddCallback( p_filter->p_libvlc, "logo-file", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-x", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-y", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-position", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-transparency", LogoCallback, p_sys );
- var_AddCallback( p_filter->p_libvlc, "logo-repeat", LogoCallback, p_sys );
+ var_AddCallback( p_filter, "logo-file", LogoCallback, p_sys );
+ var_AddCallback( p_filter, "logo-x", LogoCallback, p_sys );
+ var_AddCallback( p_filter, "logo-y", LogoCallback, p_sys );
+ var_AddCallback( p_filter, "logo-position", LogoCallback, p_sys );
+ var_AddCallback( p_filter, "logo-transparency", LogoCallback, p_sys );
+ var_AddCallback( p_filter, "logo-repeat", LogoCallback, p_sys );
- vlc_mutex_init( p_filter, &p_logo_list->lock );
+ vlc_mutex_init( &p_logo_list->lock );
vlc_mutex_lock( &p_logo_list->lock );
LoadLogoList( p_this, p_logo_list );
/* Misc init */
p_filter->pf_sub_filter = Filter;
- p_sys->b_need_update = VLC_TRUE;
+ p_sys->b_need_update = true;
p_sys->i_last_date = 0;
free( p_sys );
/* Delete the logo variables from INPUT */
- var_Destroy( p_filter->p_libvlc , "logo-file" );
- var_Destroy( p_filter->p_libvlc , "logo-x" );
- var_Destroy( p_filter->p_libvlc , "logo-y" );
- var_Destroy( p_filter->p_libvlc , "logo-delay" );
- var_Destroy( p_filter->p_libvlc , "logo-repeat" );
- var_Destroy( p_filter->p_libvlc , "logo-position" );
- var_Destroy( p_filter->p_libvlc , "logo-transparency" );
+ var_Destroy( p_filter->p_libvlc, "logo-file" );
+ var_Destroy( p_filter->p_libvlc, "logo-x" );
+ var_Destroy( p_filter->p_libvlc, "logo-y" );
+ var_Destroy( p_filter->p_libvlc, "logo-delay" );
+ var_Destroy( p_filter->p_libvlc, "logo-repeat" );
+ var_Destroy( p_filter->p_libvlc, "logo-position" );
+ var_Destroy( p_filter->p_libvlc, "logo-transparency" );
}
/*****************************************************************************
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 );
p_spu->b_absolute = p_sys->b_absolute;
p_spu->i_start = p_sys->i_last_date = date;
p_spu->i_stop = 0;
- p_spu->b_ephemer = VLC_TRUE;
+ p_spu->b_ephemer = true;
- p_sys->b_need_update = VLC_FALSE;
+ p_sys->b_need_update = false;
p_logo_list->i_next_pic = date +
( p_logo->i_delay != -1 ? p_logo->i_delay : p_logo_list->i_delay ) * 1000;
vlc_mutex_unlock( &p_logo_list->lock );
/* where to locate the logo: */
- if( p_sys->posx < 0 || p_sys->posy < 0 )
- { /* set to one of the 9 relative locations */
- p_spu->i_flags = p_sys->pos;
- p_spu->i_x = 0;
- p_spu->i_y = 0;
- p_spu->b_absolute = VLC_FALSE;
+ if( p_sys->pos < 0 )
+ { /* set to an absolute xy */
+ p_region->i_align = OSD_ALIGN_RIGHT | OSD_ALIGN_TOP;
+ p_spu->b_absolute = true;
}
else
- { /* set to an absolute xy, referenced to upper left corner */
- p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
- p_spu->i_x = p_sys->posx;
- p_spu->i_y = p_sys->posy;
- p_spu->b_absolute = VLC_TRUE;
+ { /* set to one of the 9 relative locations */
+ p_region->i_align = p_sys->pos;
+ p_spu->b_absolute = false;
}
+ p_spu->i_x = p_sys->posx;
+ p_spu->i_y = p_sys->posy;
+
p_spu->p_region = p_region;
p_spu->i_alpha = ( p_logo->i_alpha != -1 ?
static int LogoCallback( 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;
logo_list_t *p_logo_list = p_sys->p_logo_list;
p_logo_list->psz_filename = strdup( newval.psz_string );
LoadLogoList( p_this, p_logo_list );
vlc_mutex_unlock( &p_logo_list->lock );
- p_sys->b_need_update = VLC_TRUE;
+ p_sys->b_need_update = true;
}
else if ( !strncmp( psz_var, "logo-x", 6 ) )
{
p_logo_list->i_repeat = newval.i_int;
vlc_mutex_unlock( &p_logo_list->lock );
}
- p_sys->b_need_update = VLC_TRUE;
+ p_sys->b_need_update = true;
return VLC_SUCCESS;
}