/*****************************************************************************
* logo.c : logo video plugin for vlc
*****************************************************************************
- * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
- * $Id: logo.c,v 1.6 2003/12/22 02:24:53 sam Exp $
+ * Copyright (C) 2003-2006 the VideoLAN team
+ * $Id$
*
- * Authors: Simon Latapie <garf@videolan.org>
+ * Authors: Gildas Bazin <gbazin@videolan.org>
+ * Simon Latapie <garf@videolan.org>
*
* 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
*
* 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 <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <png.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
-#include <vlc/vlc.h>
-#include <vlc/vout.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_filter.h>
+#include <vlc_url.h>
-#include "filter_common.h"
+#include <vlc_image.h>
+
+#ifdef LoadImage
+# undef LoadImage
+#endif
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+#define FILE_TEXT N_("Logo filenames")
+#define FILE_LONGTEXT N_("Full path of the image files to use. Format is " \
+"<image>[,<delay in ms>[,<alpha>]][;<image>[,<delay>[,<alpha>]]][;...]. " \
+"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 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_( \
+ "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 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 };
+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") };
+
+static int OpenSub ( vlc_object_t * );
+static int OpenVideo( vlc_object_t * );
+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") )
+ set_shortname( N_("Logo overlay") )
+ add_shortcut( "logo" )
+
+ add_file( CFG_PREFIX "file", NULL, NULL, FILE_TEXT, FILE_LONGTEXT, false )
+ add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, true )
+ add_integer( CFG_PREFIX "y", -1, 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 "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 )
+
+ /* video output filter submodule */
+ add_submodule ()
+ set_capability( "video filter2", 0 )
+ set_callbacks( OpenVideo, Close )
+ set_description( N_("Logo video filter") )
+ add_shortcut( "logo" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
-static int Create ( vlc_object_t * );
-static void Destroy ( vlc_object_t * );
-static int Init ( vout_thread_t * );
-static void End ( vout_thread_t * );
-static void Render ( vout_thread_t *, picture_t * );
+/**
+ * Structure to hold the set of individual logo image names, times,
+ * transparencies
+ */
+typedef struct
+{
+ int i_delay; /* -1 means use default delay */
+ int i_alpha; /* -1 means use default alpha */
+ picture_t *p_pic;
-static int SendEvents( vlc_object_t *, char const *,
- vlc_value_t, vlc_value_t, void * );
+} logo_t;
-static int MouseEvent( vlc_object_t *, char const *,
- vlc_value_t , vlc_value_t , void * );
+/**
+ * Logo list structure.
+ */
+typedef struct
+{
+ logo_t *p_logo; /* the parsing's result */
+ unsigned int i_count; /* the number of logo images to be displayed */
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
+ 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 */
-#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")
-#define TRANS_LONGTEXT N_("You can change it by middle-clicking and moving mouse left or right")
-
-vlc_module_begin();
- add_category_hint( N_("logo"), NULL, VLC_FALSE );
- 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_float( "logo_transparency", 1, NULL, TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
- set_description( _("logo video filter") );
- set_capability( "video filter", 0 );
- add_shortcut( "logo" );
- set_callbacks( Create, Destroy );
-vlc_module_end();
+ unsigned int i_counter; /* index into the list of logo images */
-/*****************************************************************************
- * vout_sys_t: logo video output method descriptor
- *****************************************************************************
- * This structure is part of the video output thread descriptor.
- * It describes the Invert specific properties of an output thread.
- *****************************************************************************/
-struct vout_sys_t
+ int i_delay; /* default delay (0 - 60000 ms) */
+ int i_alpha; /* default alpha */
+
+} logo_list_t;
+
+/**
+ * Private logo data holder
+ */
+struct filter_sys_t
{
- 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;
+ filter_t *p_blend;
+
+ vlc_mutex_t lock;
+
+ logo_list_t list;
+
+ int i_pos;
+ int i_pos_x;
+ int i_pos_y;
+ bool b_absolute;
+
+ /* On the fly control variable */
+ bool b_spu_update;
+
+ /* */
+ bool b_mouse_grab;
};
-/*****************************************************************************
- * 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;
+static const char *const ppsz_filter_options[] = {
+ "file", "x", "y", "delay", "repeat", "opacity", "position", NULL
+};
- /* Allocate structure */
- p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
- if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
- return VLC_ENOMEM;
- }
+static const char *const ppsz_filter_callbacks[] = {
+ "logo-file",
+ "logo-x",
+ "logo-y",
+ "logo-position",
+ "logo-opacity",
+ "logo-repeat",
+ NULL
+};
- p_vout->pf_init = Init;
- p_vout->pf_end = End;
- p_vout->pf_manage = NULL;
- p_vout->pf_render = Render;
- p_vout->pf_display = NULL;
+static int OpenCommon( vlc_object_t *, bool b_sub );
- return VLC_SUCCESS;
+static subpicture_t *FilterSub( filter_t *, mtime_t );
+static picture_t *FilterVideo( filter_t *, picture_t * );
+
+static int Mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mouse_t * );
+
+static int LogoCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
+
+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 );
+
+/**
+ * Open the sub filter
+ */
+static int OpenSub( vlc_object_t *p_this )
+{
+ return OpenCommon( p_this, true );
}
-/*****************************************************************************
- * Init: initialize logo video thread output method
- *****************************************************************************/
-static int Init( vout_thread_t *p_vout )
+/**
+ * Open the video filter
+ */
+static int OpenVideo( vlc_object_t *p_this )
{
- int i_index;
- 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)
+ return OpenCommon( p_this, false );
+}
+
+/**
+ * Common open function
+ */
+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 ) )
{
- p_vout->p_sys->error=1;
- msg_Err( p_vout , "file not found %s", filename );
- free( filename );
+ msg_Err( p_filter, "Input and output format does not match" );
+ return VLC_EGENERIC;
}
- else
+
+ /* */
+ p_filter->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
+
+ /* */
+ p_sys->p_blend = NULL;
+ if( !b_sub )
{
- 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++ )
- {
- row_pointers[i] = malloc( 4 * ( p_vout->p_sys->bit_depth + 7 ) / 8 * p_vout->p_sys->width );
- }
- 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++)
+
+ p_sys->p_blend = filter_NewBlend( VLC_OBJECT(p_filter),
+ &p_filter->fmt_in.video );
+ if( !p_sys->p_blend )
{
- 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];
-
- }
-
- } else
- {
- p_vout->p_sys->png_image_a[0][idx]= 0;
- }
- }
+ free( p_sys );
+ return VLC_EGENERIC;
}
- /* now we can free row_pointers*/
- free(row_pointers);
}
- I_OUTPUTPICTURES = 0;
+ /* */
+ config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
+ p_filter->p_cfg );
- /* 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;
+ /* */
+ logo_list_t *p_list = &p_sys->list;
- /* 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 );
-
- /* Everything failed */
- if( p_vout->p_sys->p_vout == NULL )
+ psz_filename = var_CreateGetStringCommand( p_filter, "logo-file" );
+ if( !psz_filename )
{
- msg_Err( p_vout, "can't open vout, aborting" );
-
- return VLC_EGENERIC;
+ if( p_sys->p_blend )
+ filter_DeleteBlend( p_sys->p_blend );
+ free( p_sys );
+ return VLC_ENOMEM;
}
+ if( *psz_filename == '\0' )
+ msg_Warn( p_this, "no logo file specified" );
- 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);
+ 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_sys->i_pos = var_CreateGetIntegerCommand( p_filter, "logo-position" );
+ p_sys->i_pos_x = var_CreateGetIntegerCommand( p_filter, "logo-x" );
+ p_sys->i_pos_y = var_CreateGetIntegerCommand( p_filter, "logo-y" );
- ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
+ /* Ignore aligment if a position is given for video filter */
+ if( !b_sub && p_sys->i_pos_x >= 0 && p_sys->i_pos_y >= 0 )
+ p_sys->i_pos = 0;
- ADD_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
+ vlc_mutex_init( &p_sys->lock );
+ LogoListLoad( p_this, p_list, psz_filename );
+ p_sys->b_spu_update = true;
+ p_sys->b_mouse_grab = false;
- ADD_PARENT_CALLBACKS( SendEventsToChild );
+ for( int i = 0; ppsz_filter_callbacks[i]; i++ )
+ var_AddCallback( p_filter, ppsz_filter_callbacks[i],
+ LogoCallback, p_sys );
- 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 = (int)(config_GetFloat( p_vout, "logo_transparency" ) * 255);
+ /* Misc init */
+ if( b_sub )
+ {
+ p_filter->pf_sub_filter = FilterSub;
+ }
+ else
+ {
+ p_filter->pf_video_filter = FilterVideo;
+ p_filter->pf_video_mouse = Mouse;
+ }
+ free( psz_filename );
return VLC_SUCCESS;
}
-/*****************************************************************************
- * End: terminate logo video thread output method
- *****************************************************************************/
-static void End( vout_thread_t *p_vout )
+/**
+ * Common close function
+ */
+static void Close( vlc_object_t *p_this )
{
- int i_index;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ for( int i = 0; ppsz_filter_callbacks[i]; i++ )
+ var_DelCallback( p_filter, ppsz_filter_callbacks[i],
+ LogoCallback, p_sys );
+
+ if( p_sys->p_blend )
+ filter_DeleteBlend( p_sys->p_blend );
- /* Free the fake output buffers we allocated */
- for( i_index = I_OUTPUTPICTURES ; i_index ; )
+ vlc_mutex_destroy( &p_sys->lock );
+ LogoListUnload( &p_sys->list );
+ free( p_sys );
+}
+
+/**
+ * Sub filter
+ */
+static subpicture_t *FilterSub( filter_t *p_filter, mtime_t date )
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+ logo_list_t *p_list = &p_sys->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_sys->lock );
+ /* Basic test: b_spu_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_spu_update && p_list->i_next_pic > date ) ||
+ !p_list->i_repeat )
{
- i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
+ vlc_mutex_unlock( &p_sys->lock );
+ return NULL;
}
- 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);
+ /* adjust index to the next logo */
+ p_logo = LogoListNext( p_list, date );
+ p_sys->b_spu_update = false;
+
+ p_pic = p_logo->p_pic;
- 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 );
+ /* Allocate the subpicture internal data. */
+ p_spu = filter_NewSubpicture( p_filter );
+ if( !p_spu )
+ goto exit;
- config_PutInt( p_vout, "logo_x", p_vout->p_sys->posx );
- config_PutInt( p_vout, "logo_y", p_vout->p_sys->posy );
- config_PutFloat( p_vout, "logo_transparency", (float)(p_vout->p_sys->trans) / 255.0 );
+ p_spu->b_absolute = p_sys->b_absolute;
+ p_spu->i_start = date;
+ p_spu->i_stop = 0;
+ p_spu->b_ephemer = true;
- if (p_vout->p_sys->error == 0)
+ /* Send an empty subpicture to clear the display when needed */
+ if( p_list->i_repeat != -1 && p_list->i_counter == 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]);
+ p_list->i_repeat--;
+ if( p_list->i_repeat == 0 )
+ goto exit;
+ }
+ if( !p_pic || !p_logo->i_alpha ||
+ ( p_logo->i_alpha == -1 && !p_list->i_alpha ) )
+ goto exit;
+
+ /* Create new SPU region */
+ memset( &fmt, 0, sizeof(video_format_t) );
+ fmt.i_chroma = VLC_CODEC_YUVA;
+ 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 = 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 );
+ p_spu = NULL;
+ goto exit;
}
-}
-/*****************************************************************************
- * 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;
+ /* */
+ picture_Copy( p_region->p_picture, p_pic );
+
+ /* where to locate the logo: */
+ if( p_sys->i_pos < 0 )
+ { /* set to an absolute xy */
+ p_region->i_align = SUBPICTURE_ALIGN_RIGHT | SUBPICTURE_ALIGN_TOP;
+ p_spu->b_absolute = true;
+ }
+ else
+ { /* set to one of the 9 relative locations */
+ p_region->i_align = p_sys->i_pos;
+ p_spu->b_absolute = false;
+ }
+
+ p_region->i_x = p_sys->i_pos_x;
+ p_region->i_y = p_sys->i_pos_y;
+
+ p_spu->p_region = p_region;
+
+ p_spu->i_alpha = ( p_logo->i_alpha != -1 ?
+ p_logo->i_alpha : p_list->i_alpha );
- DEL_PARENT_CALLBACKS( SendEventsToChild );
+exit:
+ vlc_mutex_unlock( &p_sys->lock );
- free( p_vout->p_sys );
+ return p_spu;
}
-/*****************************************************************************
- * 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.
- *****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_pic )
+/**
+ * Video filter
+ */
+static picture_t *FilterVideo( filter_t *p_filter, picture_t *p_src )
{
- picture_t *p_outpic;
- int i_index;
- int tr;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ logo_list_t *p_list = &p_sys->list;
- /* 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 );
- }
+ picture_t *p_dst = filter_NewPicture( p_filter );
+ if( !p_dst )
+ goto exit;
- vout_DatePicture( p_vout->p_sys->p_vout, p_outpic, p_pic->date );
- vout_LinkPicture( p_vout->p_sys->p_vout, p_outpic );
+ picture_Copy( p_dst, p_src );
+ /* */
+ vlc_mutex_lock( &p_sys->lock );
- tr = p_vout->p_sys->trans;
+ logo_t *p_logo;
+ if( p_list->i_next_pic < p_src->date )
+ p_logo = LogoListNext( p_list, p_src->date );
+ else
+ p_logo = LogoListCurrent( p_list );
- for( i_index = 0 ; i_index < p_pic->i_planes ; i_index++ )
+ /* */
+ const picture_t *p_pic = p_logo->p_pic;
+ if( p_pic )
{
- 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);
-
+ const video_format_t *p_fmt = &p_pic->format;
+ const int i_dst_w = p_filter->fmt_out.video.i_visible_width;
+ const int i_dst_h = p_filter->fmt_out.video.i_visible_height;
- if (p_vout->p_sys->error == 0)
+ if( p_sys->i_pos )
{
- 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)
+ if( p_sys->i_pos & SUBPICTURE_ALIGN_BOTTOM )
{
- 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_sys->i_pos_y = i_dst_h - p_fmt->i_visible_height;
+ }
+ else if ( !(p_sys->i_pos & SUBPICTURE_ALIGN_TOP) )
{
- 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;
+ p_sys->i_pos_y = ( i_dst_h - p_fmt->i_visible_height ) / 2;
+ }
+ else
+ {
+ p_sys->i_pos_y = 0;
}
- 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];
-
- for( i = 0; i < i_max ; i++ )
+ if( p_sys->i_pos & SUBPICTURE_ALIGN_RIGHT )
+ {
+ p_sys->i_pos_x = i_dst_w - p_fmt->i_visible_width;
+ }
+ else if ( !(p_sys->i_pos & SUBPICTURE_ALIGN_LEFT) )
+ {
+ p_sys->i_pos_x = ( i_dst_w - p_fmt->i_visible_width ) / 2;
+ }
+ else
{
- for( j = 0 ; j < j_max ; j++)
- {
- *p_out = ( *p_out * ( 65025 - *p_in_a * tr) + *p_in * *p_in_a * tr) >> 16;
- p_out++;
- p_in++;
- p_in_a++;
- }
- p_out += i_delta;
+ p_sys->i_pos_x = 0;
}
- }
+ }
+
+ /* */
+ const int i_alpha = p_logo->i_alpha != -1 ? p_logo->i_alpha : p_list->i_alpha;
+ if( filter_ConfigureBlend( p_sys->p_blend, i_dst_w, i_dst_h, p_fmt ) ||
+ filter_Blend( p_sys->p_blend, p_dst, p_sys->i_pos_x, p_sys->i_pos_y,
+ p_pic, i_alpha ) )
+ {
+ msg_Err( p_filter, "failed to blend a picture" );
+ }
}
+ vlc_mutex_unlock( &p_sys->lock );
- vout_UnlinkPicture( p_vout->p_sys->p_vout, p_outpic );
+exit:
+ picture_Release( p_src );
+ return p_dst;
+}
- vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
+static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse,
+ const vlc_mouse_t *p_old, const vlc_mouse_t *p_new )
+{
+ filter_sys_t *p_sys = p_filter->p_sys;
+
+ vlc_mutex_lock( &p_sys->lock );
+ logo_t *p_logo = LogoListCurrent( &p_sys->list );
+ const picture_t *p_pic = p_logo->p_pic;
+
+ if( p_pic )
+ {
+ const video_format_t *p_fmt = &p_pic->format;
+ const int i_logo_w = p_fmt->i_visible_width;
+ const int i_logo_h = p_fmt->i_visible_height;
+
+ /* Check if we are over the logo */
+ const bool b_over = p_new->i_x >= p_sys->i_pos_x &&
+ p_new->i_x < p_sys->i_pos_x + i_logo_w &&
+ p_new->i_y >= p_sys->i_pos_y &&
+ p_new->i_y < p_sys->i_pos_y + i_logo_h;
+
+ if( b_over && vlc_mouse_HasPressed( p_old, p_new, MOUSE_BUTTON_LEFT ) )
+ p_sys->b_mouse_grab = true;
+ else if( vlc_mouse_HasReleased( p_old, p_new, MOUSE_BUTTON_LEFT ) )
+ p_sys->b_mouse_grab = false;
+
+ if( p_sys->b_mouse_grab )
+ {
+ int i_dx, i_dy;
+ vlc_mouse_GetMotion( &i_dx, &i_dy, p_old, p_new );
+ p_sys->i_pos_x = __MIN( __MAX( p_sys->i_pos_x + i_dx, 0 ),
+ 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 )
+ {
+ vlc_mutex_unlock( &p_sys->lock );
+ return VLC_EGENERIC;
+ }
+ }
+ vlc_mutex_unlock( &p_sys->lock );
+
+ *p_mouse = *p_new;
+ return VLC_SUCCESS;
}
/*****************************************************************************
- * SendEvents: forward mouse and keyboard events to the parent p_vout
+ * Callback to update params on the fly
*****************************************************************************/
-static int SendEvents( vlc_object_t *p_this, char const *psz_var,
- vlc_value_t oldval, vlc_value_t newval, void *p_data )
+static int LogoCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- var_Set( (vlc_object_t *)p_data, psz_var, newval );
+ VLC_UNUSED(oldval);
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+ logo_list_t *p_list = &p_sys->list;
+
+ vlc_mutex_lock( &p_sys->lock );
+ if( !strcmp( psz_var, "logo-file" ) )
+ {
+ LogoListUnload( p_list );
+ LogoListLoad( p_this, p_list, newval.psz_string );
+ }
+ else if ( !strcmp( psz_var, "logo-x" ) )
+ {
+ p_sys->i_pos_x = newval.i_int;
+ }
+ else if ( !strcmp( psz_var, "logo-y" ) )
+ {
+ p_sys->i_pos_y = newval.i_int;
+ }
+ else if ( !strcmp( psz_var, "logo-position" ) )
+ {
+ p_sys->i_pos = newval.i_int;
+ }
+ else if ( !strcmp( psz_var, "logo-opacity" ) )
+ {
+ p_list->i_alpha = __MAX( __MIN( newval.i_int, 255 ), 0 );
+ }
+ else if ( !strcmp( psz_var, "logo-repeat" ) )
+ {
+ p_list->i_repeat = newval.i_int;
+ }
+ p_sys->b_spu_update = true;
+ vlc_mutex_unlock( &p_sys->lock );
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 )
+/**
+ * It loads the logo image into memory.
+ */
+static picture_t *LoadImage( vlc_object_t *p_this, const char *psz_filename )
{
- vout_thread_t *p_vout = (vout_thread_t*)p_data;
- vlc_value_t valb;
- int i_delta;
+ if( !psz_filename )
+ return NULL;
- #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
+ video_format_t fmt_in;
+ video_format_Init( &fmt_in, 0 );
- var_Get( p_vout->p_sys->p_vout, "mouse-button-down", &valb );
+ video_format_t fmt_out;
+ video_format_Init( &fmt_out, VLC_CODEC_YUVA );
- i_delta = newval.i_int - oldval.i_int;
+ image_handler_t *p_image = image_HandlerCreate( p_this );
+ if( !p_image )
+ return NULL;
- 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)
+ char *psz_url = make_URI( psz_filename, NULL );
+ picture_t *p_pic = image_ReadUrl( p_image, psz_url, &fmt_in, &fmt_out );
+ free( psz_url );
+ image_HandlerDelete( p_image );
+
+ return p_pic;
+}
+
+/**
+ * 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 opacity will use the
+ * logo-delay and logo-opacity values.
+ */
+static void LogoListLoad( vlc_object_t *p_this, logo_list_t *p_logo_list,
+ const char *psz_filename )
+{
+ char *psz_list; /* the list: <logo>[,[<delay>[,[<alpha>]]]][;...] */
+ 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_original = psz_list = strdup( psz_filename );
+ if( !psz_list )
+ abort();
+
+ /* Count the number logos == number of ';' + 1 */
+ p_logo_list->i_count = 1;
+ for( i = 0; i < strlen( psz_list ); i++ )
{
- return VLC_SUCCESS;
+ if( psz_list[i] == ';' )
+ p_logo_list->i_count++;
}
- if( psz_var[6] == 'x' )
- {
- 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)))
- {
- posx = __MIN( __MAX( posx + i_delta , 0 ) , p_vout->output.i_width - width );
- }
+ p_logo_list->p_logo =
+ p_logo = calloc( p_logo_list->i_count, sizeof(*p_logo) );
+ if( !p_logo )
+ abort();
- }
- else if( psz_var[6] == 'y' )
+ /* Fill the data */
+ for( i = 0; i < p_logo_list->i_count; i++ )
{
- 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)))
+ char *p_c = strchr( psz_list, ';' );
+ char *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 ) )
{
- posy = __MIN( __MAX( posy + i_delta , 0 ) , p_vout->output.i_height - height );
+ /* <logo>,<delay>[,<alpha>] 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 if( psz_var[6] == 'c' )
- {
- if ((valb.i_int & 0x8) == 1)
+ else
{
- p_vout->p_sys->trans++;
+ /* <logo> type */
+ if( p_c )
+ *p_c = '\0';
}
- else if ((valb.i_int & 0x10) == 1)
+
+ 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 )
{
- p_vout->p_sys->trans--;
+ msg_Warn( p_this, "error while loading logo %s, will be skipped",
+ psz_list );
}
+
+ if( p_c )
+ psz_list = &p_c[1];
}
- #undef posx
- #undef posy
- #undef width
- #undef height
- #undef trans
+ /* initialize so that on the first update it will wrap back to 0 */
+ p_logo_list->i_counter = p_logo_list->i_count - 1;
- return VLC_SUCCESS;
+ free( psz_original );
}
-/*****************************************************************************
- * 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 )
+/**
+ * Unload a list of logo and release associated ressources.
+ */
+static void LogoListUnload( logo_list_t *p_list )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- var_Set( p_vout->p_sys->p_vout, psz_var, newval );
- return VLC_SUCCESS;
+ for( unsigned i = 0; i < p_list->i_count; i++ )
+ {
+ logo_t *p_logo = &p_list->p_logo[i];
+
+ if( p_logo->p_pic )
+ picture_Release( p_logo->p_pic );
+ }
+ free( p_list->p_logo );
}
+
+/**
+ * Go to the next logo and return its pointer.
+ */
+static logo_t *LogoListNext( logo_list_t *p_list, mtime_t i_date )
+{
+ p_list->i_counter = ( p_list->i_counter + 1 ) % p_list->i_count;
+
+ logo_t *p_logo = LogoListCurrent( p_list );
+
+ p_list->i_next_pic = i_date + ( p_logo->i_delay != -1 ?
+ p_logo->i_delay : p_list->i_delay ) * 1000;
+ return p_logo;
+}
+/**
+ * Return the current logo pointer
+ */
+static logo_t *LogoListCurrent( logo_list_t *p_list )
+{
+ return &p_list->p_logo[p_list->i_counter];
+}
+
projects / vlc / blobdiff