X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Flogo.c;h=0d5ee56b87487cb9b2799c6665211888b4b3eed9;hb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;hp=a0619a35a3d60ddc5fd136bc07f483f3c798f79d;hpb=82b181de655676d9c768e9458a6c2f3268aa5bf4;p=vlc diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index a0619a35a3..0d5ee56b87 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -1,7 +1,7 @@ /***************************************************************************** * logo.c : logo video plugin for vlc ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2006 the VideoLAN team * $Id$ * * Authors: Gildas Bazin @@ -19,22 +19,29 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include +#include +#include +#include #include "vlc_filter.h" #include "filter_common.h" +#include "vlc_image.h" +#include "vlc_osd.h" + +#ifdef LoadImage +# undef LoadImage +#endif /***************************************************************************** * Local prototypes @@ -48,155 +55,234 @@ static void Render ( vout_thread_t *, picture_t * ); static int SendEvents( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static int MouseEvent ( vlc_object_t *, char const *, +static int MouseEvent( vlc_object_t *, char const *, vlc_value_t , vlc_value_t , void * ); -static int Control ( vout_thread_t *, int, va_list ); +static int Control ( vout_thread_t *, int, va_list ); static int CreateFilter ( vlc_object_t * ); static void DestroyFilter( vlc_object_t * ); +static int LogoCallback( vlc_object_t *, char const *, + vlc_value_t, vlc_value_t, void * ); + /***************************************************************************** * Module descriptor *****************************************************************************/ -#define FILE_TEXT N_("Logo filename") -#define FILE_LONGTEXT N_("Full path of the PNG file to use.") -#define POSX_TEXT N_("X coordinate of the logo") -#define POSX_LONGTEXT N_("You can move the logo by left-clicking on it." ) -#define POSY_TEXT N_("Y coordinate of the logo") -#define POSY_LONGTEXT N_("You can move the logo by left-clicking on it." ) +#define FILE_TEXT N_("Logo filenames") +#define FILE_LONGTEXT N_("Full path of the image files to use. Format is " \ +"[,[,]][;[,[,]]][;...]. " \ +"If you only have one file, simply enter its filename.") +#define REPEAT_TEXT N_("Logo animation # of loops") +#define REPEAT_LONGTEXT N_("Number of loops for the logo animation." \ + "-1 = continuous, 0 = disabled") +#define DELAY_TEXT N_("Logo individual image time in ms") +#define DELAY_LONGTEXT N_("Individual image display time of 0 - 60000 ms.") + +#define POSX_TEXT N_("X coordinate") +#define POSX_LONGTEXT N_("X coordinate of the logo. You can move the logo " \ + "by left-clicking it." ) +#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_("You can set the logo transparency value here " \ +#define TRANS_LONGTEXT N_("Logo transparency value " \ "(from 0 for full transparency to 255 for full opacity)." ) +#define POS_TEXT N_("Logo position") +#define POS_LONGTEXT N_( \ + "Enforce the logo position on the video " \ + "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ + "also use combinations of these values, eg 6 = top-right).") + +#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_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" ) + + 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( 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, NULL ); + + /* video output filter submodule */ + add_submodule () + 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[] = { + "file", "x", "y", "delay", "repeat", "transparency", "position", NULL +}; + +/***************************************************************************** + * Structure to hold the set of individual logo image names, times, + * transparencies + ****************************************************************************/ +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; + +} logo_t; + +/***************************************************************************** + * Logo list structure. Common to both the vout and sub picture filter + ****************************************************************************/ +typedef struct +{ + logo_t *p_logo; /* the parsing's result */ + unsigned int i_count; /* the number of logo images to be displayed */ + + int i_repeat; /* how often to repeat the images, image time in ms */ + mtime_t i_next_pic; /* when to bring up a new logo image */ + + unsigned int i_counter; /* index into the list of logo images */ + + 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 ? ) */ -vlc_module_begin(); - set_description( _("Logo video filter") ); - set_capability( "video filter", 0 ); - add_shortcut( "logo" ); - set_callbacks( Create, Destroy ); - - add_file( "logo-file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, VLC_FALSE ); - add_integer( "logo-x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE ); - add_integer( "logo-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE ); - add_integer_with_range( "logo-transparency", 255, 0, 255, NULL, - TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE ); - - /* subpicture filter submodule */ - add_submodule(); - set_capability( "sub filter", 0 ); - set_callbacks( CreateFilter, DestroyFilter ); - set_description( _("Logo sub filter") ); - add_shortcut( "logo" ); -vlc_module_end(); + vlc_mutex_t lock; +} logo_list_t; /***************************************************************************** - * LoadPNG: loads the PNG logo into memory + * LoadImage: loads the logo image into memory *****************************************************************************/ -static picture_t *LoadPNG( vlc_object_t *p_this ) +static picture_t *LoadImage( vlc_object_t *p_this, char *psz_filename ) { picture_t *p_pic; - char *psz_filename; - vlc_value_t val; - FILE *file; - int i, j, i_trans; - vlc_bool_t b_alpha = VLC_TRUE; - - png_uint_32 i_width, i_height; - int i_color_type, i_interlace_type, i_compression_type, i_filter_type; - int i_bit_depth; - png_bytep *p_row_pointers; - png_structp p_png; - png_infop p_info, p_end_info; - - var_Create( p_this, "logo-file", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); - var_Get( p_this, "logo-file", &val ); - psz_filename = val.psz_string; - if( !psz_filename || !*psz_filename ) - { - msg_Err( p_this, "logo file not specified" ); - return 0; - } + image_handler_t *p_image; + video_format_t fmt_in; + video_format_t fmt_out; - if( !(file = fopen( psz_filename , "rb" )) ) - { - msg_Err( p_this, "logo file (%s) not found", psz_filename ); - free( psz_filename ); - return 0; - } - free( psz_filename ); + memset( &fmt_in, 0, sizeof(video_format_t) ); + memset( &fmt_out, 0, sizeof(video_format_t) ); - p_png = png_create_read_struct( PNG_LIBPNG_VER_STRING, 0, 0, 0 ); - p_info = png_create_info_struct( p_png ); - p_end_info = png_create_info_struct( p_png ); - png_init_io( p_png, file ); - png_read_info( p_png, p_info ); - png_get_IHDR( p_png, p_info, &i_width, &i_height, - &i_bit_depth, &i_color_type, &i_interlace_type, - &i_compression_type, &i_filter_type); + fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); + p_image = image_HandlerCreate( p_this ); + p_pic = image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out ); + image_HandlerDelete( p_image ); - if( i_color_type == PNG_COLOR_TYPE_PALETTE ) - png_set_palette_to_rgb( p_png ); + return p_pic; +} - if( i_color_type == PNG_COLOR_TYPE_GRAY || - i_color_type == PNG_COLOR_TYPE_GRAY_ALPHA ) - png_set_gray_to_rgb( p_png ); +/***************************************************************************** + * LoadLogoList: 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. + *****************************************************************************/ +#define LoadLogoList( a, b ) __LoadLogoList( VLC_OBJECT( a ), b ) +static void __LoadLogoList( vlc_object_t *p_this, logo_list_t *p_logo_list ) +{ + char *psz_list; /* the list: [,[[,[]]]][;...] */ + unsigned int i; + logo_t *p_logo; /* the parsing's result */ - if( png_get_valid( p_png, p_info, PNG_INFO_tRNS ) ) - { - png_set_tRNS_to_alpha( p_png ); - } - else if( !(i_color_type & PNG_COLOR_MASK_ALPHA) ) + p_logo_list->i_counter = 0; + p_logo_list->i_next_pic = 0; + + psz_list = strdup( p_logo_list->psz_filename ); + + /* Count the number logos == number of ';' + 1 */ + p_logo_list->i_count = 1; + for( i = 0; i < strlen( psz_list ); i++ ) { - b_alpha = VLC_FALSE; + if( psz_list[i] == ';' ) p_logo_list->i_count++; } - p_row_pointers = malloc( sizeof(png_bytep) * i_height ); - for( i = 0; i < (int)i_height; i++ ) + p_logo_list->p_logo = p_logo = + (logo_t *)malloc( p_logo_list->i_count * sizeof(logo_t) ); + + /* Fill the data */ + for( i = 0; i < p_logo_list->i_count; i++ ) { - p_row_pointers[i] = malloc( 4 * ( i_bit_depth + 7 ) / 8 * i_width ); - } - png_read_image( p_png, p_row_pointers ); - png_read_end( p_png, p_end_info ); + char *p_c; + char *p_c2; + p_c = strchr( psz_list, ';' ); + p_c2 = strchr( psz_list, ',' ); + + p_logo[i].i_alpha = -1; /* use default settings */ + p_logo[i].i_delay = -1; /* use default settings */ + + if( p_c2 && ( p_c2 < p_c || !p_c ) ) + { + /* ,[,] type */ + if( p_c2[1] != ',' && p_c2[1] != ';' && p_c2[1] != '\0' ) + p_logo[i].i_delay = atoi( p_c2+1 ); + *p_c2 = '\0'; + if( ( p_c2 = strchr( p_c2+1, ',' ) ) + && ( p_c2 < p_c || !p_c ) && p_c2[1] != ';' && p_c2[1] != '\0' ) + p_logo[i].i_alpha = atoi( p_c2 + 1 ); + } + else + { + /* type */ + if( p_c ) *p_c = '\0'; + } + + p_logo[i].psz_file = strdup( psz_list ); + p_logo[i].p_pic = LoadImage( p_this, p_logo[i].psz_file ); - fclose( file ); - png_destroy_read_struct( &p_png, &p_info, &p_end_info ); + if( !p_logo[i].p_pic ) + { + msg_Warn( p_this, "error while loading logo %s, will be skipped", + p_logo[i].psz_file ); + } + + if( p_c ) psz_list = p_c + 1; + } - /* Convert to YUVA */ - p_pic = malloc( sizeof(picture_t) ); - if( vout_AllocatePicture( p_this, p_pic, VLC_FOURCC('Y','U','V','A'), - i_width, i_height, VOUT_ASPECT_FACTOR ) != - VLC_SUCCESS ) + for( i = 0; i < p_logo_list->i_count; i++ ) { - free( p_row_pointers ); - return 0; + 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 ); } - var_Create(p_this, "logo-transparency", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT); - var_Get( p_this, "logo-transparency", &val ); - i_trans = __MAX( __MIN( val.i_int, 255 ), 0 ); + /* initialize so that on the first update it will wrap back to 0 */ + p_logo_list->i_counter = p_logo_list->i_count; +} - for( j = 0; j < (int)i_height ; j++ ) +/***************************************************************************** + * FreeLogoList + *****************************************************************************/ +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++ ) { - uint8_t *p = (uint8_t *)p_row_pointers[j]; - - for( i = 0; i < (int)i_width ; i++ ) + logo_t *p_logo = &p_logo_list->p_logo[i]; + FREENULL( p_logo->psz_file ); + if( p_logo->p_pic ) { - int i_offset = i + j * p_pic->p[Y_PLANE].i_pitch; - - p_pic->p[Y_PLANE].p_pixels[i_offset] = - (p[0] * 257L + p[1] * 504 + p[2] * 98)/1000 + 16; - p_pic->p[U_PLANE].p_pixels[i_offset] = - (p[2] * 439L - p[0] * 148 - p[1] * 291)/1000 + 128; - p_pic->p[V_PLANE].p_pixels[i_offset] = - (p[0] * 439L - p[1] * 368 - p[2] * 71)/1000 + 128; - p_pic->p[A_PLANE].p_pixels[i_offset] = - b_alpha ? (p[3] * i_trans) / 255 : i_trans; - - p += (b_alpha ? 4 : 3); + picture_Release( p_logo->p_pic ); + p_logo->p_pic = NULL; } } - - free( p_row_pointers ); - return p_pic; } /***************************************************************************** @@ -207,13 +293,14 @@ static picture_t *LoadPNG( vlc_object_t *p_this ) *****************************************************************************/ struct vout_sys_t { + logo_list_t *p_logo_list; + vout_thread_t *p_vout; filter_t *p_blend; - picture_t *p_pic; int i_width, i_height; - int posx, posy; + int pos, posx, posy; }; /***************************************************************************** @@ -223,16 +310,32 @@ 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 */ p_sys = p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); if( p_sys == NULL ) + 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; @@ -240,22 +343,16 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_display = NULL; p_vout->pf_control = Control; - 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; + 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 ); - p_sys->p_pic = LoadPNG( p_this ); - if( !p_sys->p_pic ) - { - free( p_sys ); - return VLC_EGENERIC; - } - - p_sys->i_width = p_sys->p_pic->p[Y_PLANE].i_visible_pitch; - p_sys->i_height = p_sys->p_pic->p[Y_PLANE].i_visible_lines; + LoadLogoList( p_vout, p_logo_list ); return VLC_SUCCESS; } @@ -268,14 +365,24 @@ 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; + 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 = + ( p_logo_list->i_counter + 1 )%p_logo_list->i_count; + p_pic = p_logo_list->p_logo[p_logo_list->i_counter].p_pic; /* Initialize the output structure */ p_vout->output.i_chroma = p_vout->render.i_chroma; p_vout->output.i_width = p_vout->render.i_width; p_vout->output.i_height = p_vout->render.i_height; p_vout->output.i_aspect = p_vout->render.i_aspect; + p_vout->fmt_out = p_vout->fmt_in; + fmt = p_vout->fmt_out; /* Load the video blending filter */ p_sys->p_blend = vlc_object_create( p_vout, sizeof(filter_t) ); @@ -288,12 +395,14 @@ static int Init( vout_thread_t *p_vout ) p_sys->p_blend->fmt_out.video.i_chroma = p_vout->output.i_chroma; p_sys->p_blend->fmt_in.video.i_chroma = VLC_FOURCC('Y','U','V','A'); p_sys->p_blend->fmt_in.video.i_aspect = VOUT_ASPECT_FACTOR; - p_sys->p_blend->fmt_in.video.i_width = - p_sys->p_blend->fmt_in.video.i_visible_width = - p_sys->p_pic->p[Y_PLANE].i_visible_pitch; - p_sys->p_blend->fmt_in.video.i_height = - p_sys->p_blend->fmt_in.video.i_visible_height = - p_sys->p_pic->p[Y_PLANE].i_visible_lines; + p_sys->i_width = + p_sys->p_blend->fmt_in.video.i_width = + p_sys->p_blend->fmt_in.video.i_visible_width = + p_pic ? p_pic->p[Y_PLANE].i_visible_pitch : 0; + p_sys->i_height = + p_sys->p_blend->fmt_in.video.i_height = + p_sys->p_blend->fmt_in.video.i_visible_height = + p_pic ? p_pic->p[Y_PLANE].i_visible_lines : 0; p_sys->p_blend->fmt_out.video.i_width = p_sys->p_blend->fmt_out.video.i_visible_width = p_vout->output.i_width; @@ -302,21 +411,46 @@ static int Init( vout_thread_t *p_vout ) 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", NULL, false ); if( !p_sys->p_blend->p_module ) { 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; } + if( p_sys->posx < 0 || p_sys->posy < 0 ) + { + p_sys->posx = 0; p_sys->posy = 0; + + if( p_sys->pos & SUBPICTURE_ALIGN_BOTTOM ) + { + p_sys->posy = p_vout->render.i_height - p_sys->i_height; + } + else if ( !(p_sys->pos & SUBPICTURE_ALIGN_TOP) ) + { + 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; + } + else if ( !(p_sys->pos & SUBPICTURE_ALIGN_LEFT) ) + { + 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" ); - p_sys->p_vout = - vout_Create( p_vout, p_vout->render.i_width, p_vout->render.i_height, - p_vout->render.i_chroma, p_vout->render.i_aspect ); + p_sys->p_vout = vout_Create( p_vout, &fmt ); /* Everything failed */ if( p_sys->p_vout == NULL ) @@ -343,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 ; ) { @@ -353,17 +491,12 @@ 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 ); + 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 ); } /***************************************************************************** @@ -374,11 +507,9 @@ 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 ); - if( p_sys->p_pic && p_sys->p_pic->p_data_orig ) - free( p_sys->p_pic->p_data_orig ); - if( p_sys->p_pic ) free( p_sys->p_pic ); + FreeLogoList( p_sys->p_logo_list ); + free( p_sys->p_logo_list ); free( p_sys ); } @@ -386,23 +517,79 @@ static void Destroy( vlc_object_t *p_this ) /***************************************************************************** * Render: render the logo onto the video *****************************************************************************/ -static void Render( vout_thread_t *p_vout, picture_t *p_pic ) +static void Render( vout_thread_t *p_vout, picture_t *p_inpic ) { vout_sys_t *p_sys = p_vout->p_sys; picture_t *p_outpic; + picture_t *p_pic; + logo_list_t *p_logo_list; + logo_t * p_logo; + + p_logo_list = p_sys->p_logo_list; + + if( p_logo_list->i_next_pic < p_inpic->date ) + { + /* It's time to use a new logo */ + p_logo_list->i_counter = + ( p_logo_list->i_counter + 1 )%p_logo_list->i_count; + p_logo = &p_logo_list->p_logo[p_sys->p_logo_list->i_counter]; + p_pic = p_logo->p_pic; + p_logo_list->i_next_pic = p_inpic->date + ( p_logo->i_delay != -1 ? + p_logo->i_delay : p_logo_list->i_delay ) * 1000; + if( p_pic ) + { + + p_sys->i_width = + p_sys->p_blend->fmt_in.video.i_width = + p_sys->p_blend->fmt_in.video.i_visible_width = + p_pic->p[Y_PLANE].i_visible_pitch; + p_sys->i_height = + p_sys->p_blend->fmt_in.video.i_height = + p_sys->p_blend->fmt_in.video.i_visible_height = + p_pic->p[Y_PLANE].i_visible_lines; + + if( p_sys->pos ) + { + if( p_sys->pos & SUBPICTURE_ALIGN_BOTTOM ) + { + p_sys->posy = p_vout->render.i_height - p_sys->i_height; + } + else if ( !(p_sys->pos & SUBPICTURE_ALIGN_TOP) ) + { + 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; + } + else if ( !(p_sys->pos & SUBPICTURE_ALIGN_LEFT) ) + { + p_sys->posx = p_vout->render.i_width/2 - p_sys->i_width/2; + } + } + } + + } + else + { + p_logo = &p_logo_list->p_logo[p_sys->p_logo_list->i_counter]; + p_pic = p_logo->p_pic; + } /* 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 ); } - vout_CopyPicture( p_vout, p_outpic, p_pic ); - vout_DatePicture( p_sys->p_vout, p_outpic, p_pic->date ); + picture_Copy( p_outpic, p_inpic ); - p_sys->p_blend->pf_video_blend( p_sys->p_blend, p_outpic, p_outpic, - p_sys->p_pic, p_sys->posx, p_sys->posy ); + if( p_pic ) + 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 ); } @@ -413,6 +600,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) 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; } @@ -423,6 +611,7 @@ static int SendEvents( vlc_object_t *p_this, char const *psz_var, 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; @@ -481,6 +670,7 @@ static int Control( vout_thread_t *p_vout, int i_query, va_list args ) 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; @@ -491,12 +681,15 @@ static int SendEventsToChild( vlc_object_t *p_this, char const *psz_var, *****************************************************************************/ struct filter_sys_t { - picture_t *p_pic; + logo_list_t *p_logo_list; - int i_width, i_height; - int posx, posy; + int pos, posx, posy; + bool b_absolute; mtime_t i_last_date; + + /* On the fly control variable */ + bool b_need_update; }; static subpicture_t *Filter( filter_t *, mtime_t ); @@ -508,36 +701,62 @@ static int CreateFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys; - vlc_value_t val; + logo_list_t *p_logo_list; /* Allocate structure */ p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_sys == NULL ) + 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; } - 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; + config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options, + p_filter->p_cfg ); - p_sys->p_pic = LoadPNG( p_this ); - if( !p_sys->p_pic ) + /* Hook used for callback variables */ + p_logo_list->psz_filename = + 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" ); free( p_sys ); + free( p_logo_list ); return VLC_EGENERIC; } - p_sys->i_width = p_sys->p_pic->p[Y_PLANE].i_visible_pitch; - p_sys->i_height = p_sys->p_pic->p[Y_PLANE].i_visible_lines; - p_sys->i_last_date = 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_CreateGetIntegerCommand( p_filter, "logo-delay" ); + p_logo_list->i_repeat = + var_CreateGetIntegerCommand( p_filter, "logo-repeat" ); + + 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_logo_list->lock ); + vlc_mutex_lock( &p_logo_list->lock ); + + LoadLogoList( p_this, p_logo_list ); + + vlc_mutex_unlock( &p_logo_list->lock ); /* Misc init */ p_filter->pf_sub_filter = Filter; + p_sys->b_need_update = true; + + p_sys->i_last_date = 0; return VLC_SUCCESS; } @@ -550,56 +769,179 @@ static void DestroyFilter( vlc_object_t *p_this ) filter_t *p_filter = (filter_t *)p_this; filter_sys_t *p_sys = p_filter->p_sys; - if( p_sys->p_pic && p_sys->p_pic->p_data_orig ) - free( p_sys->p_pic->p_data_orig ); - if( p_sys->p_pic ) free( p_sys->p_pic ); - + vlc_mutex_destroy( &p_sys->p_logo_list->lock ); + FreeLogoList( p_sys->p_logo_list ); + free( p_sys->p_logo_list ); 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" ); } -/**************************************************************************** +/***************************************************************************** * Filter: the whole thing - **************************************************************************** + ***************************************************************************** * This function outputs subpictures at regular time intervals. - ****************************************************************************/ + *****************************************************************************/ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) { filter_sys_t *p_sys = p_filter->p_sys; + logo_list_t *p_logo_list = p_sys->p_logo_list; subpicture_t *p_spu; subpicture_region_t *p_region; video_format_t fmt; + picture_t *p_pic; + logo_t *p_logo; + + vlc_mutex_lock( &p_logo_list->lock ); + /* Basic test: b_need_update occurs on a dynamic change, + & i_next_pic is the general timer, when to + look at updating the logo image */ + + if( ( ( !p_sys->b_need_update ) && ( p_logo_list->i_next_pic > date ) ) + || !p_logo_list->i_repeat ) + { + vlc_mutex_unlock( &p_logo_list->lock ); + return 0; + } + /* prior code tested on && p_sys->i_last_date +5000000 > date ) return 0; */ + + /* adjust index to the next logo */ + p_logo_list->i_counter = + ( p_logo_list->i_counter + 1 )%p_logo_list->i_count; - if( p_sys->i_last_date && p_sys->i_last_date + 5000000 > date ) return 0; + p_logo = &p_logo_list->p_logo[p_logo_list->i_counter]; + p_pic = p_logo->p_pic; /* Allocate the subpicture internal data. */ - p_spu = p_filter->pf_sub_buffer_new( p_filter ); - if( !p_spu ) return NULL; + p_spu = filter_NewSubpicture( p_filter ); + if( !p_spu ) + { + vlc_mutex_unlock( &p_logo_list->lock ); + return NULL; + } + + 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 = true; + + 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; + + if( p_logo_list->i_repeat != -1 + && p_logo_list->i_counter == 0 ) + { + p_logo_list->i_repeat--; + if( p_logo_list->i_repeat == 0 ) + { + vlc_mutex_unlock( &p_logo_list->lock ); + return p_spu; + } + } + + if( !p_pic || !p_logo->i_alpha + || ( p_logo->i_alpha == -1 && !p_logo_list->i_alpha ) ) + { + /* Send an empty subpicture to clear the display */ + vlc_mutex_unlock( &p_logo_list->lock ); + return p_spu; + } /* Create new SPU region */ memset( &fmt, 0, sizeof(video_format_t) ); fmt.i_chroma = VLC_FOURCC('Y','U','V','A'); fmt.i_aspect = VOUT_ASPECT_FACTOR; - fmt.i_width = fmt.i_visible_width = p_sys->i_width; - fmt.i_height = fmt.i_visible_height = p_sys->i_height; + 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; 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" ); p_filter->pf_sub_buffer_del( p_filter, p_spu ); + vlc_mutex_unlock( &p_logo_list->lock ); return NULL; } - vout_CopyPicture( p_filter, &p_region->picture, p_sys->p_pic ); - p_region->i_x = 0; - p_region->i_y = 0; - p_spu->i_x = p_sys->posx; - p_spu->i_y = p_sys->posy; + /* 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: */ + 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 one of the 9 relative locations */ + p_region->i_align = p_sys->pos; + p_spu->b_absolute = false; + } + + p_region->i_x = p_sys->posx; + p_region->i_y = p_sys->posy; + p_spu->p_region = p_region; - p_spu->i_start = p_sys->i_last_date = date; - p_spu->i_stop = 0; - p_spu->b_ephemer = VLC_TRUE; + p_spu->i_alpha = ( p_logo->i_alpha != -1 ? + p_logo->i_alpha : p_logo_list->i_alpha ); return p_spu; } + +/***************************************************************************** + * Callback to update params on the fly + *****************************************************************************/ +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; + + if( !strncmp( psz_var, "logo-file", 6 ) ) + { + vlc_mutex_lock( &p_logo_list->lock ); + FreeLogoList( 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 = true; + } + else if ( !strncmp( psz_var, "logo-x", 6 ) ) + { + p_sys->posx = newval.i_int; + } + else if ( !strncmp( psz_var, "logo-y", 6 ) ) + { + p_sys->posy = newval.i_int; + } + else if ( !strncmp( psz_var, "logo-position", 12 ) ) + { + p_sys->pos = newval.i_int; + } + else if ( !strncmp( psz_var, "logo-transparency", 9 ) ) + { + vlc_mutex_lock( &p_logo_list->lock ); + p_logo_list->i_alpha = __MAX( __MIN( newval.i_int, 255 ), 0 ); + vlc_mutex_unlock( &p_logo_list->lock ); + } + else if ( !strncmp( psz_var, "logo-repeat", 11 ) ) + { + vlc_mutex_lock( &p_logo_list->lock ); + p_logo_list->i_repeat = newval.i_int; + vlc_mutex_unlock( &p_logo_list->lock ); + } + p_sys->b_need_update = true; + return VLC_SUCCESS; +}