X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Flogo.c;h=bf6bb52266d368e735df6fb5f87c83b05e580559;hb=3f35c5171d9181434ebb16ffbdec7f7d62c28b8d;hp=b009aabc1fcf3de6258bbf84a13821d83e3973d0;hpb=707ee8ea31dd8f0c92ad4e9fdec955ee6205f2df;p=vlc diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index b009aabc1f..bf6bb52266 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -1,10 +1,11 @@ /***************************************************************************** * logo.c : logo video plugin for vlc ***************************************************************************** - * Copyright (C) 2003-2004 VideoLAN + * Copyright (C) 2003-2006 the VideoLAN team * $Id$ * - * Authors: Simon Latapie + * Authors: Gildas Bazin + * Simon Latapie * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,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 @@ -47,37 +55,236 @@ 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 *, + vlc_value_t , vlc_value_t , void * ); +static int Control ( vout_thread_t *, int, va_list ); -static int MouseEvent( vlc_object_t *, char const *, - vlc_value_t , vlc_value_t , void * ); +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_("The file must be in PNG RGBA 8bits format (for now).") -#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 TRANS_TEXT N_("Transparency of the logo (255-0)") -#define TRANS_LONGTEXT N_("You can change it by middle-clicking and moving mouse left or right.") +#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_("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_description( _("Logo video filter") ); + set_description( N_("Logo video filter") ); set_capability( "video filter", 0 ); - - 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 ); - + 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 ); + 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, 0 ); + + /* subpicture filter submodule */ + add_submodule(); + set_capability( "sub filter", 0 ); + set_callbacks( CreateFilter, DestroyFilter ); + 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 + ****************************************************************************/ +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_mutex_t lock; +} logo_list_t; + +/***************************************************************************** + * LoadImage: loads the logo image into memory + *****************************************************************************/ +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; + 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 ); + p_pic = image_ReadUrl( p_image, psz_filename, &fmt_in, &fmt_out ); + image_HandlerDelete( p_image ); + + return p_pic; +} + +/***************************************************************************** + * 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 */ + + 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++ ) + { + if( psz_list[i] == ';' ) p_logo_list->i_count++; + } + + 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++ ) + { + 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 ); + + 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; + } + + 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; +} + +/***************************************************************************** + * 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++ ) + { + logo_t *p_logo = &p_logo_list->p_logo[i]; + FREENULL( p_logo->psz_file ); + if( p_logo->p_pic ) + { + p_logo->p_pic->pf_release( p_logo->p_pic ); + p_logo->p_pic = NULL; + } + } +} + /***************************************************************************** * vout_sys_t: logo video output method descriptor ***************************************************************************** @@ -86,45 +293,47 @@ vlc_module_end(); *****************************************************************************/ struct vout_sys_t { + logo_list_t *p_logo_list; + vout_thread_t *p_vout; - png_uint_32 height; - int bit_depth; - png_uint_32 width; - uint8_t * png_image[3]; - uint8_t * png_image_u; - uint8_t * png_image_v; - uint8_t * png_image_a[3]; - uint8_t * png_image_a_little; - int error; - int posx, posy; - int trans; -}; -/***************************************************************************** - * Control: control facility for the vout (forwards to child vout) - *****************************************************************************/ -static int Control( vout_thread_t *p_vout, int i_query, va_list args ) -{ - return vout_vaControl( p_vout->p_sys->p_vout, i_query, args ); -} + filter_t *p_blend; + + int i_width, i_height; + int pos, posx, posy; +}; /***************************************************************************** * Create: allocates logo video thread output method - ***************************************************************************** - * This function allocates and initializes a Invert vout method. *****************************************************************************/ static int Create( vlc_object_t *p_this ) { vout_thread_t *p_vout = (vout_thread_t *)p_this; + vout_sys_t *p_sys; + logo_list_t *p_logo_list; /* Allocate structure */ - p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); - if( p_vout->p_sys == NULL ) + 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" ); + return VLC_EGENERIC; + } + p_vout->pf_init = Init; p_vout->pf_end = End; p_vout->pf_manage = NULL; @@ -132,6 +341,17 @@ static int Create( vlc_object_t *p_this ) p_vout->pf_display = NULL; p_vout->pf_control = Control; + 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 ); + return VLC_SUCCESS; } @@ -140,160 +360,110 @@ static int Create( vlc_object_t *p_this ) *****************************************************************************/ static int Init( vout_thread_t *p_vout ) { - int i_index; + vout_sys_t *p_sys = p_vout->p_sys; picture_t *p_pic; - char * filename; - FILE * fp; - int color_type; - int interlace_type; - int compression_type; - int filter_type; - png_structp png_ptr; - png_bytep * row_pointers; - png_infop info_ptr; - unsigned int i; -// unsigned int j; - unsigned int x; - unsigned int y; - int temp; - int i_size; - int i_parity_width; - int i_parity_height; - - /* read png file */ - filename = config_GetPsz( p_vout, "logo-file" ); - fp = fopen( filename , "rb"); - png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL , NULL , NULL); - info_ptr = png_create_info_struct(png_ptr); - - if (fp == NULL) + 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) ); + vlc_object_attach( p_sys->p_blend, p_vout ); + p_sys->p_blend->fmt_out.video.i_x_offset = + p_sys->p_blend->fmt_out.video.i_y_offset = 0; + p_sys->p_blend->fmt_in.video.i_x_offset = + p_sys->p_blend->fmt_in.video.i_y_offset = 0; + p_sys->p_blend->fmt_out.video.i_aspect = p_vout->render.i_aspect; + 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->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; + p_sys->p_blend->fmt_out.video.i_height = + p_sys->p_blend->fmt_out.video.i_visible_height = + p_vout->output.i_height; + + p_sys->p_blend->p_module = + module_Need( p_sys->p_blend, "video blending", 0, 0 ); + if( !p_sys->p_blend->p_module ) { - p_vout->p_sys->error=1; - msg_Err( p_vout , "file not found %s", filename ); - free( filename ); + msg_Err( p_vout, "can't open blending filter, aborting" ); + vlc_object_detach( p_sys->p_blend ); + vlc_object_release( p_sys->p_blend ); + return VLC_EGENERIC; } - else + + if( p_sys->posx < 0 || p_sys->posy < 0 ) { - free( filename ); - p_vout->p_sys->error=0; - png_init_io(png_ptr, fp); - png_read_info(png_ptr, info_ptr); - png_get_IHDR(png_ptr, info_ptr, &p_vout->p_sys->width, &p_vout->p_sys->height, - &p_vout->p_sys->bit_depth, &color_type, &interlace_type, - &compression_type, &filter_type); - row_pointers= malloc( sizeof(png_bytep) * p_vout->p_sys->height ); - for( i = 0; i < p_vout->p_sys->height; i++ ) + p_sys->posx = 0; p_sys->posy = 0; + + if( p_sys->pos & SUBPICTURE_ALIGN_BOTTOM ) { - row_pointers[i] = malloc( 4 * ( p_vout->p_sys->bit_depth + 7 ) / 8 * p_vout->p_sys->width ); + p_sys->posy = p_vout->render.i_height - p_sys->i_height; } - png_read_image(png_ptr, row_pointers); - fclose(fp); - /* finish to read the image in the file. Now We have to convert it YUV */ - /* initialize yuv plans of the image */ - i_parity_width = p_vout->p_sys->width % 2; - i_parity_height = p_vout->p_sys->height % 2; - - p_vout->p_sys->height = p_vout->p_sys->height - + (p_vout->p_sys->height % 2); - p_vout->p_sys->width = p_vout->p_sys->width - + (p_vout->p_sys->width % 2); - i_size = p_vout->p_sys->height * p_vout->p_sys->width; - - p_vout->p_sys->png_image[0] = malloc( i_size ); - p_vout->p_sys->png_image[1] = malloc( i_size / 4 ); - p_vout->p_sys->png_image[2] = malloc( i_size / 4 ); - - p_vout->p_sys->png_image_a[0] = malloc( i_size ); - p_vout->p_sys->png_image_a[1] = malloc( i_size / 4 ); - p_vout->p_sys->png_image_a[2] = p_vout->p_sys->png_image_a[1]; - - for( y = 0; y < p_vout->p_sys->height ; y++) + else if ( !(p_sys->pos & SUBPICTURE_ALIGN_TOP) ) { - for( x = 0; x < p_vout->p_sys->width ; x++) - { - uint8_t (*p)[4]; - int idx; - int idxc; - - /* FIXME FIXME */ - p = (void*)row_pointers[y]; - idx = x + y * p_vout->p_sys->width; - idxc= x/2 + (y/2) * (p_vout->p_sys->width/2); - - if( ((i_parity_width == 0) || (x != (p_vout->p_sys->width - 1))) && - ((i_parity_height == 0) || (y != (p_vout->p_sys->height - 1)))) - { - p_vout->p_sys->png_image_a[0][idx]= p[x][3]; - p_vout->p_sys->png_image[0][idx]= (p[x][0] * 257 - + p[x][1] * 504 - + p[x][2] * 98)/1000 + 16; - - if( ( x % 2 == 0 ) && ( y % 2 == 0 ) ) - { - - temp = (p[x][2] * 439 - - p[x][0] * 148 - - p[x][1] * 291)/1000 + 128; - - temp = __MAX( __MIN( temp, 255 ), 0 ); - p_vout->p_sys->png_image[1][idxc] = temp; - - temp = ( p[x][0] * 439 - - p[x][1] * 368 - - p[x][2] * 71)/1000 + 128; - temp = __MAX( __MIN( temp, 255 ), 0 ); - p_vout->p_sys->png_image[2][idxc] = temp; - p_vout->p_sys->png_image_a[1][idxc] = p_vout->p_sys->png_image_a[0][idx]; - - } + p_sys->posy = p_vout->render.i_height / 2 - p_sys->i_height / 2; + } - } else - { - p_vout->p_sys->png_image_a[0][idx]= 0; - } - } + 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; } - /* now we can free row_pointers*/ - free(row_pointers); } - - I_OUTPUTPICTURES = 0; - - /* 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; + else + { + p_sys->pos = 0; + } /* Try to open the real video output */ msg_Dbg( p_vout, "spawning the real video output" ); - p_vout->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_vout->p_sys->p_vout == NULL ) + if( p_sys->p_vout == NULL ) { msg_Err( p_vout, "can't open vout, aborting" ); - return VLC_EGENERIC; } - var_AddCallback( p_vout->p_sys->p_vout, "mouse-x", MouseEvent, p_vout); - var_AddCallback( p_vout->p_sys->p_vout, "mouse-y", MouseEvent, p_vout); - + var_AddCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout); + var_AddCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout); ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES ); - - ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - + ADD_CALLBACKS( p_sys->p_vout, SendEvents ); ADD_PARENT_CALLBACKS( SendEventsToChild ); - p_vout->p_sys->posx = config_GetInt( p_vout, "logo-x" ); - p_vout->p_sys->posy = config_GetInt( p_vout, "logo-y" ); - p_vout->p_sys->trans = config_GetInt( p_vout, "logo-transparency"); - return VLC_SUCCESS; } @@ -302,8 +472,13 @@ static int Init( vout_thread_t *p_vout ) *****************************************************************************/ 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 ; ) { @@ -311,127 +486,111 @@ static void End( vout_thread_t *p_vout ) free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig ); } - var_DelCallback( p_vout->p_sys->p_vout, "mouse-x", MouseEvent, p_vout); - var_DelCallback( p_vout->p_sys->p_vout, "mouse-y", MouseEvent, 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_vout->p_sys->p_vout ) - { - DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); - vlc_object_detach( p_vout->p_sys->p_vout ); - vout_Destroy( p_vout->p_sys->p_vout ); - } + vout_Destroy( p_sys->p_vout ); - config_PutInt( p_vout, "logo-x", p_vout->p_sys->posx ); - config_PutInt( p_vout, "logo-y", p_vout->p_sys->posy ); - - if (p_vout->p_sys->error == 0) - { - free(p_vout->p_sys->png_image[0]); - free(p_vout->p_sys->png_image[1]); - free(p_vout->p_sys->png_image[2]); - free(p_vout->p_sys->png_image_a[0]); - free(p_vout->p_sys->png_image_a[1]); - } + 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_release( p_sys->p_blend ); } /***************************************************************************** * Destroy: destroy logo video thread output method - ***************************************************************************** - * Terminate an output method created by InvertCreateOutputMethod *****************************************************************************/ 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 ); - free( p_vout->p_sys ); + FreeLogoList( p_sys->p_logo_list ); + free( p_sys->p_logo_list ); + + free( p_sys ); } /***************************************************************************** - * Render: displays previously rendered output - ***************************************************************************** - * This function send the currently rendered image to Invert image, waits - * until it is displayed and switch the two rendering buffers, preparing next - * frame. + * 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; - int i_index; - int tr; - - /* This is a new frame. Get a structure from the video_output. */ - while( ( p_outpic = vout_CreatePicture( p_vout->p_sys->p_vout, 0, 0, 0 ) ) - == NULL ) - { - if( p_vout->b_die || p_vout->b_error ) - { - return; - } - msleep( VOUT_OUTMEM_SLEEP ); - } - - vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date ); - vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic ); - + picture_t *p_pic; + logo_list_t *p_logo_list; + logo_t * p_logo; - tr = p_vout->p_sys->trans; + p_logo_list = p_sys->p_logo_list; - for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ ) + if( p_logo_list->i_next_pic < p_inpic->date ) { - memcpy( p_outpic->p[i_index].p_pixels, - p_pic->p[i_index].p_pixels, - p_pic->p[i_index].i_lines * p_pic->p[i_index].i_pitch); - - - if (p_vout->p_sys->error == 0) + /* 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 ) { - unsigned int i; - unsigned int j; - uint8_t *p_out, *p_in_a, *p_in; - int i_delta; - unsigned int i_max; - unsigned int j_max; - - if (i_index == 0) - { - p_out = p_outpic->p[i_index].p_pixels + - p_vout->p_sys->posy * p_outpic->p[i_index].i_pitch + - p_vout->p_sys->posx; - i_max = p_vout->p_sys->height; - j_max = p_vout->p_sys->width; - } else - { - p_out = p_outpic->p[i_index].p_pixels + - p_vout->p_sys->posy / 2 * p_outpic->p[i_index].i_pitch + - p_vout->p_sys->posx / 2; - i_max = p_vout->p_sys->height / 2; - j_max = p_vout->p_sys->width / 2; - } - i_delta = p_outpic->p[i_index].i_pitch - j_max; - - p_in_a = p_vout->p_sys->png_image_a[i_index]; - p_in = p_vout->p_sys->png_image[i_index]; + 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; - for( i = 0; i < i_max ; i++ ) + if( p_sys->pos ) { - for( j = 0 ; j < j_max ; j++) + 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_out = ( *p_out * ( 65025 - *p_in_a * tr) + *p_in * *p_in_a * tr ) >> 16; - p_out++; - p_in++; - p_in_a++; + 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; } - p_out += i_delta; } - } + } + + } + else + { + p_logo = &p_logo_list->p_logo[p_sys->p_logo_list->i_counter]; + p_pic = p_logo->p_pic; } - vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic ); + /* 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( !vlc_object_alive (p_vout) || p_vout->b_error ) return; + msleep( VOUT_OUTMEM_SLEEP ); + } + + vout_CopyPicture( p_vout, p_outpic, 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_pic, p_sys->posx, p_sys->posy, + p_logo->i_alpha != -1 ? p_logo->i_alpha + : p_logo_list->i_alpha ); - vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic ); + vout_DisplayPicture( p_sys->p_vout, p_outpic ); } /***************************************************************************** @@ -440,38 +599,28 @@ 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; } - /***************************************************************************** * MouseEvent: callback for mouse events - ******************************************************************************/ + *****************************************************************************/ 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; int i_delta; - #define posx p_vout->p_sys->posx - #define posy p_vout->p_sys->posy - #define width p_vout->p_sys->width - #define height p_vout->p_sys->height - #define trans p_vout->p_sys->trans - var_Get( p_vout->p_sys->p_vout, "mouse-button-down", &valb ); i_delta = newval.i_int - oldval.i_int; - if ((valb.i_int & 0x2) == 2 && psz_var[6] == 'x' ) - { - trans = __MIN( __MAX( trans + i_delta , 0 ) , 255 ); - return VLC_SUCCESS; - } - if ((valb.i_int & 0x1) == 0) + if( (valb.i_int & 0x1) == 0 ) { return VLC_SUCCESS; } @@ -480,50 +629,317 @@ static int MouseEvent( vlc_object_t *p_this, char const *psz_var, { vlc_value_t valy; var_Get( p_vout->p_sys->p_vout, "mouse-y", &valy ); - if ((newval.i_int >= (int)posx) && (valy.i_int >= (int)posy) && (newval.i_int <= (int)(posx + width)) && (valy.i_int <= (int)(posy + height))) + if( newval.i_int >= (int)p_sys->posx && + valy.i_int >= (int)p_sys->posy && + newval.i_int <= (int)(p_sys->posx + p_sys->i_width) && + valy.i_int <= (int)(p_sys->posy + p_sys->i_height) ) { - posx = __MIN( __MAX( posx + i_delta , 0 ) , p_vout->output.i_width - width ); + p_sys->posx = __MIN( __MAX( p_sys->posx + i_delta, 0 ), + p_vout->output.i_width - p_sys->i_width ); } - } else if( psz_var[6] == 'y' ) { vlc_value_t valx; var_Get( p_vout->p_sys->p_vout, "mouse-x", &valx ); - if ((valx.i_int >= (int)posx) && (newval.i_int >= (int)posy) && (valx.i_int <= (int)(posx + width)) && (newval.i_int <= (int)(posy + height))) - { - posy = __MIN( __MAX( posy + i_delta , 0 ) , p_vout->output.i_height - height ); - } - - } - else if( psz_var[6] == 'c' ) - { - if ((valb.i_int & 0x8) == 1) + if( valx.i_int >= (int)p_sys->posx && + newval.i_int >= (int)p_sys->posy && + valx.i_int <= (int)(p_sys->posx + p_sys->i_width) && + newval.i_int <= (int)(p_sys->posy + p_sys->i_height) ) { - p_vout->p_sys->trans++; - } - else if ((valb.i_int & 0x10) == 1) - { - p_vout->p_sys->trans--; + p_sys->posy = __MIN( __MAX( p_sys->posy + i_delta, 0 ), + p_vout->output.i_height - p_sys->i_height ); } } - #undef posx - #undef posy - #undef width - #undef height - #undef trans - return VLC_SUCCESS; } +/***************************************************************************** + * Control: control facility for the vout (forwards to child vout) + *****************************************************************************/ +static int Control( vout_thread_t *p_vout, int i_query, va_list args ) +{ + return vout_vaControl( p_vout->p_sys->p_vout, i_query, args ); +} + /***************************************************************************** * SendEventsToChild: forward events to the child/children vout *****************************************************************************/ 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; } + +/***************************************************************************** + * filter_sys_t: logo filter descriptor + *****************************************************************************/ +struct filter_sys_t +{ + logo_list_t *p_logo_list; + + 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 ); + +/***************************************************************************** + * CreateFilter: allocates logo video filter + *****************************************************************************/ +static int CreateFilter( vlc_object_t *p_this ) +{ + filter_t *p_filter = (filter_t *)p_this; + filter_sys_t *p_sys; + 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 ) + { + 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_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->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; +} + +/***************************************************************************** + * DestroyFilter: destroy logo video filter + *****************************************************************************/ +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; + + 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; + + 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 ) + { + 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_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 ); + 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_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_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 ? + 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; +}