X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Flogo.c;h=37f8eeedd2b4bd4a578593a9d1df67195046d14e;hb=0d0e440d0913cdd29eae92685928c9d862cdfd70;hp=ef7f06723b6f9a310fc60918371c544be2b2d0ee;hpb=30086cdcb5559b0d2520dfece8fe7879995af4b4;p=vlc diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index ef7f06723b..37f8eeedd2 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -61,8 +61,8 @@ #define POSY_TEXT N_("Y coordinate") #define POSY_LONGTEXT N_("Y coordinate of the logo. You can move the logo " \ "by left-clicking it." ) -#define TRANS_TEXT N_("Transparency of the logo") -#define TRANS_LONGTEXT N_("Logo transparency value " \ +#define OPACITY_TEXT N_("Opacity of the logo") +#define OPACITY_LONGTEXT N_("Logo opacity value " \ "(from 0 for full transparency to 255 for full opacity)." ) #define POS_TEXT N_("Logo position") #define POS_LONGTEXT N_( \ @@ -70,6 +70,8 @@ "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ "also use combinations of these values, eg 6 = top-right).") +#define LOGO_HELP N_("Use a local picture as logo on the video") + #define CFG_PREFIX "logo-" static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; @@ -84,7 +86,7 @@ static void Close ( vlc_object_t * ); vlc_module_begin () set_category( CAT_VIDEO ) set_subcategory( SUBCAT_VIDEO_SUBPIC ) - + set_help(LOGO_HELP) set_capability( "sub filter", 0 ) set_callbacks( OpenSub, Close ) set_description( N_("Logo sub filter") ) @@ -97,8 +99,8 @@ vlc_module_begin () /* default to 1000 ms per image, continuously cycle through them */ 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_with_range( CFG_PREFIX "opacity", 255, 0, 255, NULL, + OPACITY_TEXT, OPACITY_LONGTEXT, false ) add_integer( CFG_PREFIX "position", -1, NULL, POS_TEXT, POS_LONGTEXT, false ) change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL ) @@ -121,7 +123,6 @@ vlc_module_end () */ typedef struct { - char *psz_file; /* candidate for deletion -- not needed */ int i_delay; /* -1 means use default delay */ int i_alpha; /* -1 means use default alpha */ picture_t *p_pic; @@ -144,8 +145,6 @@ typedef struct int i_delay; /* default delay (0 - 60000 ms) */ int i_alpha; /* default alpha */ - char *psz_filename; /* --logo-file string ( is it really useful - * to store it ? ) */ } logo_list_t; /** @@ -172,7 +171,7 @@ struct filter_sys_t }; static const char *const ppsz_filter_options[] = { - "file", "x", "y", "delay", "repeat", "transparency", "position", NULL + "file", "x", "y", "delay", "repeat", "opacity", "position", NULL }; static const char *const ppsz_filter_callbacks[] = { @@ -180,7 +179,7 @@ static const char *const ppsz_filter_callbacks[] = { "logo-x", "logo-y", "logo-position", - "logo-transparency", + "logo-opacity", "logo-repeat", NULL }; @@ -195,7 +194,7 @@ static int Mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mous static int LogoCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static void LogoListLoad( vlc_object_t *, logo_list_t * ); +static void LogoListLoad( vlc_object_t *, logo_list_t *, const char * ); static void LogoListUnload( logo_list_t * ); static logo_t *LogoListNext( logo_list_t *p_list, mtime_t i_date ); static logo_t *LogoListCurrent( logo_list_t *p_list ); @@ -223,6 +222,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub ) { filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys; + char *psz_filename; /* */ if( !b_sub && !es_format_IsSimilar( &p_filter->fmt_in, &p_filter->fmt_out ) ) @@ -231,7 +231,6 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub ) return VLC_EGENERIC; } - /* */ p_filter->p_sys = p_sys = malloc( sizeof( *p_sys ) ); if( !p_sys ) @@ -243,7 +242,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub ) { p_sys->p_blend = filter_NewBlend( VLC_OBJECT(p_filter), - &p_filter->fmt_in ); + &p_filter->fmt_in.video ); if( !p_sys->p_blend ) { free( p_sys ); @@ -258,25 +257,21 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub ) /* */ logo_list_t *p_list = &p_sys->list; - p_list->psz_filename = - var_CreateGetStringCommand( p_filter, "logo-file" ); - if( !p_list->psz_filename ) + psz_filename = var_CreateGetStringCommand( p_filter, "logo-file" ); + if( !psz_filename ) { if( p_sys->p_blend ) filter_DeleteBlend( p_sys->p_blend ); free( p_sys ); return VLC_ENOMEM; } - if( *p_list->psz_filename == '\0' ) + if( *psz_filename == '\0' ) msg_Warn( p_this, "no logo file specified" ); - p_list->i_alpha = var_CreateGetIntegerCommand( p_filter, - "logo-transparency"); + p_list->i_alpha = var_CreateGetIntegerCommand( p_filter, "logo-opacity"); p_list->i_alpha = __MAX( __MIN( p_list->i_alpha, 255 ), 0 ); - p_list->i_delay = - var_CreateGetIntegerCommand( p_filter, "logo-delay" ); - p_list->i_repeat = - var_CreateGetIntegerCommand( p_filter, "logo-repeat" ); + p_list->i_delay = var_CreateGetIntegerCommand( p_filter, "logo-delay" ); + p_list->i_repeat = var_CreateGetIntegerCommand( p_filter, "logo-repeat" ); p_sys->i_pos = var_CreateGetIntegerCommand( p_filter, "logo-position" ); p_sys->i_pos_x = var_CreateGetIntegerCommand( p_filter, "logo-x" ); @@ -287,7 +282,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub ) p_sys->i_pos = 0; vlc_mutex_init( &p_sys->lock ); - LogoListLoad( p_this, p_list ); + LogoListLoad( p_this, p_list, psz_filename ); p_sys->b_spu_update = true; p_sys->b_mouse_grab = false; @@ -303,9 +298,10 @@ static int OpenCommon( vlc_object_t *p_this, bool b_sub ) else { p_filter->pf_video_filter = FilterVideo; - p_filter->pf_mouse = Mouse; + p_filter->pf_video_mouse = Mouse; } + free( psz_filename ); return VLC_SUCCESS; } @@ -385,7 +381,6 @@ static subpicture_t *FilterSub( filter_t *p_filter, mtime_t date ) /* Create new SPU region */ memset( &fmt, 0, sizeof(video_format_t) ); fmt.i_chroma = VLC_CODEC_YUVA; - fmt.i_aspect = VOUT_ASPECT_FACTOR; fmt.i_sar_num = fmt.i_sar_den = 1; 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; @@ -538,6 +533,14 @@ static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse, p_filter->fmt_in.video.i_width - i_logo_w ); p_sys->i_pos_y = __MIN( __MAX( p_sys->i_pos_y + i_dy, 0 ), p_filter->fmt_in.video.i_height - i_logo_h ); + + /* object under mouse has moved */ + var_SetBool( p_filter->p_parent, "mouse-object", true ); + } + else if( b_over ) + { + /* object under mouse stoped moving */ + var_SetBool( p_filter->p_parent, "mouse-object", false ); } if( p_sys->b_mouse_grab || b_over ) @@ -566,10 +569,7 @@ static int LogoCallback( vlc_object_t *p_this, char const *psz_var, if( !strcmp( psz_var, "logo-file" ) ) { LogoListUnload( p_list ); - p_list->psz_filename = strdup( newval.psz_string ); - if( !p_list->psz_filename ) - abort(); - LogoListLoad( p_this, p_list ); + LogoListLoad( p_this, p_list, newval.psz_string ); } else if ( !strcmp( psz_var, "logo-x" ) ) { @@ -583,7 +583,7 @@ static int LogoCallback( vlc_object_t *p_this, char const *psz_var, { p_sys->i_pos = newval.i_int; } - else if ( !strcmp( psz_var, "logo-transparency" ) ) + else if ( !strcmp( psz_var, "logo-opacity" ) ) { p_list->i_alpha = __MAX( __MIN( newval.i_int, 255 ), 0 ); } @@ -600,7 +600,7 @@ static int LogoCallback( vlc_object_t *p_this, char const *psz_var, /** * It loads the logo image into memory. */ -static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename ) +static picture_t *LoadImage( vlc_object_t *p_this, const char *psz_filename ) { if( !psz_filename ) return NULL; @@ -624,21 +624,23 @@ static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename ) /** * It loads the logo images into memory. * - * Read the logo-file input switch, obtaining a list of images and associated - * durations and transparencies. Store the image(s), and times. An image - * without a stated time or transparency will use the logo-delay and - * logo-transparency values. + * Read the logo-file input switch, obtaining a list of images and + * associated durations and transparencies. Store the image(s), and + * times. An image without a stated time or opacity will use the + * logo-delay and logo-opacity values. */ -static void LogoListLoad( vlc_object_t *p_this, logo_list_t *p_logo_list ) +static void LogoListLoad( vlc_object_t *p_this, logo_list_t *p_logo_list, + const char *psz_filename ) { char *psz_list; /* the list: [,[[,[]]]][;...] */ + char *psz_original; unsigned int i; logo_t *p_logo; /* the parsing's result */ p_logo_list->i_counter = 0; p_logo_list->i_next_pic = 0; - psz_list = strdup( p_logo_list->psz_filename ); + psz_original = psz_list = strdup( psz_filename ); if( !psz_list ) abort(); @@ -681,27 +683,23 @@ static void LogoListLoad( vlc_object_t *p_this, logo_list_t *p_logo_list ) *p_c = '\0'; } - p_logo[i].psz_file = strdup( psz_list ); - p_logo[i].p_pic = LoadImage( p_this, p_logo[i].psz_file ); - + msg_Dbg( p_this, "logo file name %s, delay %d, alpha %d", + psz_list, p_logo[i].i_delay, p_logo[i].i_alpha ); + p_logo[i].p_pic = LoadImage( p_this, psz_list ); if( !p_logo[i].p_pic ) { msg_Warn( p_this, "error while loading logo %s, will be skipped", - p_logo[i].psz_file ); + psz_list ); } if( p_c ) psz_list = &p_c[1]; } - for( i = 0; i < p_logo_list->i_count; i++ ) - { - msg_Dbg( p_this, "logo file name %s, delay %d, alpha %d", - p_logo[i].psz_file, p_logo[i].i_delay, p_logo[i].i_alpha ); - } - /* initialize so that on the first update it will wrap back to 0 */ p_logo_list->i_counter = p_logo_list->i_count - 1; + + free( psz_original ); } /** @@ -709,19 +707,14 @@ static void LogoListLoad( vlc_object_t *p_this, logo_list_t *p_logo_list ) */ static void LogoListUnload( logo_list_t *p_list ) { - free( p_list->psz_filename ); - for( unsigned i = 0; i < p_list->i_count; i++ ) { logo_t *p_logo = &p_list->p_logo[i]; - free( p_logo->psz_file ); if( p_logo->p_pic ) - { picture_Release( p_logo->p_pic ); - p_logo->p_pic = NULL; - } } + free( p_list->p_logo ); } /**