X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Flogo.c;h=8147d1638014ff9983f1fde2402041da28307211;hb=7c849b4cbae23352bcbffb10d4c96776559dd736;hp=f8818f4ab4d2e6156e018a0f35ed9b19886a3450;hpb=d3fe7f28797d4dba65ffcdd60bf932e758a48a9e;p=vlc diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index f8818f4ab4..8147d16380 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -25,8 +25,6 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include #include #include @@ -93,7 +91,7 @@ static int LogoCallback( vlc_object_t *, char const *, #define CFG_PREFIX "logo-" static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static char *ppsz_pos_descriptions[] = +static const char *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") }; @@ -122,7 +120,6 @@ vlc_module_begin(); set_capability( "sub filter", 0 ); set_callbacks( CreateFilter, DestroyFilter ); set_description( _("Logo sub filter") ); - add_shortcut( "logo" ); vlc_module_end(); static const char *ppsz_filter_options[] = { @@ -171,7 +168,11 @@ static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename ) { 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 ); @@ -190,7 +191,7 @@ static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename ) * 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: [,[[,[]]]][;...] */ unsigned int i; @@ -263,18 +264,18 @@ void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list ) /***************************************************************************** * 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; + p_logo->p_pic->pf_release( p_logo->p_pic ); + p_logo->p_pic = NULL; } } } @@ -304,7 +305,6 @@ static int Create( vlc_object_t *p_this ) { 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 */ @@ -329,36 +329,25 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_display = NULL; p_vout->pf_control = Control; - p_logo_list->psz_filename = var_CreateGetString( p_this , "logo-file" ); + 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_this, "logo file not specified" ); + msg_Err( p_vout, "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 ); @@ -373,11 +362,11 @@ static int Init( vout_thread_t *p_vout ) 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 = @@ -450,6 +439,10 @@ static int Init( vout_thread_t *p_vout ) 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" ); @@ -554,12 +547,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic ) 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 ) { @@ -569,7 +557,6 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic ) { 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; @@ -731,10 +718,9 @@ static int CreateFilter( vlc_object_t *p_this ) 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_global , "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" ); @@ -743,22 +729,22 @@ static int CreateFilter( vlc_object_t *p_this ) return VLC_EGENERIC; } - p_sys->posx = var_CreateGetInteger( p_filter->p_libvlc_global , "logo-x" ); - p_sys->posy = var_CreateGetInteger( p_filter->p_libvlc_global , "logo-y" ); - p_sys->pos = var_CreateGetInteger( p_filter->p_libvlc_global , "logo-position" ); - p_logo_list->i_alpha = __MAX( __MIN( var_CreateGetInteger( - p_filter->p_libvlc_global, "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_global , "logo-delay" ); + var_CreateGetIntegerCommand( p_filter, "logo-delay" ); p_logo_list->i_repeat = - var_CreateGetInteger( p_filter->p_libvlc_global , "logo-repeat" ); + var_CreateGetIntegerCommand( p_filter, "logo-repeat" ); - var_AddCallback( p_filter->p_libvlc_global, "logo-file", LogoCallback, p_sys ); - var_AddCallback( p_filter->p_libvlc_global, "logo-x", LogoCallback, p_sys ); - var_AddCallback( p_filter->p_libvlc_global, "logo-y", LogoCallback, p_sys ); - var_AddCallback( p_filter->p_libvlc_global, "logo-position", LogoCallback, p_sys ); - var_AddCallback( p_filter->p_libvlc_global, "logo-transparency", LogoCallback, p_sys ); - var_AddCallback( p_filter->p_libvlc_global, "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_lock( &p_logo_list->lock ); @@ -790,13 +776,13 @@ static void DestroyFilter( vlc_object_t *p_this ) free( p_sys ); /* Delete the logo variables from INPUT */ - var_Destroy( p_filter->p_libvlc_global , "logo-file" ); - var_Destroy( p_filter->p_libvlc_global , "logo-x" ); - var_Destroy( p_filter->p_libvlc_global , "logo-y" ); - var_Destroy( p_filter->p_libvlc_global , "logo-delay" ); - var_Destroy( p_filter->p_libvlc_global , "logo-repeat" ); - var_Destroy( p_filter->p_libvlc_global , "logo-position" ); - var_Destroy( p_filter->p_libvlc_global , "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" ); } /***************************************************************************** @@ -893,14 +879,14 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) /* 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_region->i_align = p_sys->pos; p_spu->i_x = 0; p_spu->i_y = 0; p_spu->b_absolute = VLC_FALSE; } else { /* set to an absolute xy, referenced to upper left corner */ - p_spu->i_flags = OSD_ALIGN_LEFT | OSD_ALIGN_TOP; + p_region->i_align = 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;