X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Flogo.c;h=4c7321da3ff065ab3fbdc81a9433e034b660e0cd;hb=14dd917d87e75ac1c7284373020ec3982082011b;hp=038e248c86a0281b5d4c2866b1835bc2c4cefcb0;hpb=27d483e9ef7a451397d7857251c8d67097661f1d;p=vlc diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 038e248c86..4c7321da3f 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -30,7 +30,7 @@ # include "config.h" #endif -#include +#include #include #include @@ -95,19 +95,19 @@ 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 const char *ppsz_pos_descriptions[] = +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_capability( "video filter", 0 ); - set_shortname( _("Logo overlay") ); + 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 ); @@ -118,16 +118,16 @@ vlc_module_begin(); 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( _("Logo sub filter") ); + set_capability( "video filter", 0 ); + set_callbacks( Create, Destroy ); + set_description( N_("Logo video filter") ); vlc_module_end(); -static const char *ppsz_filter_options[] = { +static const char *const ppsz_filter_options[] = { "file", "x", "y", "delay", "repeat", "transparency", "position", NULL }; @@ -279,7 +279,7 @@ static void FreeLogoList( logo_list_t *p_logo_list ) 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; } } @@ -315,14 +315,10 @@ static int Create( vlc_object_t *p_this ) /* 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; } @@ -335,6 +331,8 @@ static int Create( vlc_object_t *p_this ) 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; } @@ -479,6 +477,10 @@ static void End( vout_thread_t *p_vout ) 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 ; ) { @@ -489,12 +491,7 @@ static void End( vout_thread_t *p_vout ) 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 ); @@ -510,7 +507,6 @@ static void Destroy( vlc_object_t *p_this ) 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 ); @@ -583,7 +579,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic ) /* 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 ); } @@ -591,7 +587,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_inpic ) vout_DatePicture( p_sys->p_vout, p_outpic, p_inpic->date ); if( p_pic ) - p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic, p_outpic, + 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 ); @@ -711,14 +707,10 @@ static int CreateFilter( vlc_object_t *p_this ) /* 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; } @@ -829,7 +821,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) 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 ); @@ -896,8 +888,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) 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;