/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc_vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#include <assert.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_filter.h>
+#include <vlc_url.h>
-#include "vlc_filter.h"
-#include "filter_common.h"
-#include "vlc_image.h"
-#include "vlc_osd.h"
+#include <vlc_image.h>
#ifdef LoadImage
# undef LoadImage
#endif
-/*****************************************************************************
- * 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 * );
-
-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 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 POSY_TEXT N_("Y coordinate")
#define POSY_LONGTEXT N_("Y coordinate of the logo. You can move the logo " \
"by left-clicking it." )
-#define TRANS_TEXT N_("Transparency of the logo")
-#define TRANS_LONGTEXT N_("Logo transparency value " \
+#define OPACITY_TEXT N_("Opacity of the logo")
+#define OPACITY_LONGTEXT N_("Logo opacity value " \
"(from 0 for full transparency to 255 for full opacity)." )
#define POS_TEXT N_("Logo position")
#define POS_LONGTEXT N_( \
"(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 int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
-static const char *ppsz_pos_descriptions[] =
+static const int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
+static const char *const ppsz_pos_descriptions[] =
{ N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
-vlc_module_begin();
- set_description( _("Logo video filter") );
- set_capability( "video filter", 0 );
- set_shortname( _("Logo overlay") );
- set_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, VLC_FALSE );
- add_integer( CFG_PREFIX "x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_TRUE );
- add_integer( CFG_PREFIX "y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_TRUE );
+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, VLC_TRUE );
- add_integer( CFG_PREFIX "repeat", -1, NULL, REPEAT_TEXT, REPEAT_LONGTEXT, VLC_TRUE );
- add_integer_with_range( CFG_PREFIX "transparency", 255, 0, 255, NULL,
- TRANS_TEXT, TRANS_LONGTEXT, VLC_FALSE );
- add_integer( CFG_PREFIX "position", 6, NULL, POS_TEXT, POS_LONGTEXT, VLC_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( _("Logo sub filter") );
- add_shortcut( "logo" );
-vlc_module_end();
-
-static const char *ppsz_filter_options[] = {
- "file", "x", "y", "delay", "repeat", "transparency", "position", NULL
-};
+ 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
+ *****************************************************************************/
+
+/**
* 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
- ****************************************************************************/
+/**
+ * Logo list structure.
+ */
typedef struct
{
logo_t *p_logo; /* the parsing's result */
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 )
+/**
+ * Private logo data holder
+ */
+struct filter_sys_t
{
- char *psz_list; /* the list: <logo>[,[<delay>[,[<alpha>]]]][;...] */
- unsigned int i;
- logo_t *p_logo; /* the parsing's result */
+ filter_t *p_blend;
- p_logo_list->i_counter = 0;
- p_logo_list->i_next_pic = 0;
+ vlc_mutex_t lock;
- psz_list = strdup( p_logo_list->psz_filename );
+ logo_list_t list;
- /* 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++;
- }
+ int i_pos;
+ int i_pos_x;
+ int i_pos_y;
+ bool b_absolute;
- p_logo_list->p_logo = p_logo =
- (logo_t *)malloc( p_logo_list->i_count * sizeof(logo_t) );
+ /* On the fly control variable */
+ bool b_spu_update;
- /* 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, ',' );
+ /* */
+ bool b_mouse_grab;
+};
- p_logo[i].i_alpha = -1; /* use default settings */
- p_logo[i].i_delay = -1; /* use default settings */
+static const char *const ppsz_filter_options[] = {
+ "file", "x", "y", "delay", "repeat", "opacity", "position", NULL
+};
- if( p_c2 && ( p_c2 < p_c || !p_c ) )
- {
- /* <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
- {
- /* <logo> type */
- if( p_c ) *p_c = '\0';
- }
+static const char *const ppsz_filter_callbacks[] = {
+ "logo-file",
+ "logo-x",
+ "logo-y",
+ "logo-position",
+ "logo-opacity",
+ "logo-repeat",
+ NULL
+};
- p_logo[i].psz_file = strdup( psz_list );
- p_logo[i].p_pic = LoadImage( p_this, p_logo[i].psz_file );
+static int OpenCommon( vlc_object_t *, bool b_sub );
- if( !p_logo[i].p_pic )
- {
- msg_Warn( p_this, "error while loading logo %s, will be skipped",
- p_logo[i].psz_file );
- }
+static subpicture_t *FilterSub( filter_t *, mtime_t );
+static picture_t *FilterVideo( filter_t *, picture_t * );
- if( p_c ) psz_list = p_c + 1;
- }
+static int Mouse( filter_t *, vlc_mouse_t *, const vlc_mouse_t *, const vlc_mouse_t * );
- 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 );
- }
+static int LogoCallback( vlc_object_t *, char const *,
+ vlc_value_t, vlc_value_t, void * );
- /* initialize so that on the first update it will wrap back to 0 */
- p_logo_list->i_counter = p_logo_list->i_count;
-}
+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 );
-/*****************************************************************************
- * FreeLogoList
- *****************************************************************************/
-static void FreeLogoList( logo_list_t *p_logo_list )
+/**
+ * Open the sub filter
+ */
+static int OpenSub( vlc_object_t *p_this )
{
- 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;
- }
- }
+ return OpenCommon( p_this, true );
}
-/*****************************************************************************
- * 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
+/**
+ * Open the video filter
+ */
+static int OpenVideo( vlc_object_t *p_this )
{
- logo_list_t *p_logo_list;
-
- vout_thread_t *p_vout;
-
- filter_t *p_blend;
-
- int i_width, i_height;
- int pos, posx, posy;
-};
-
-/*****************************************************************************
- * Create: allocates logo video thread output 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_sys = p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
- if( p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
- return VLC_ENOMEM;
- }
- p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
- if( p_logo_list == NULL )
- {
- msg_Err( p_vout, "out of memory" );
- free( p_sys );
- return VLC_ENOMEM;
- }
-
- 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;
- p_vout->pf_control = Control;
-
- 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 0;
- }
-
- 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;
+ return OpenCommon( p_this, false );
}
-/*****************************************************************************
- * Init: initialize logo video thread output method
- *****************************************************************************/
-static int Init( vout_thread_t *p_vout )
+/**
+ * Common open function
+ */
+static int OpenCommon( vlc_object_t *p_this, bool b_sub )
{
- 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) );
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys;
+ char *psz_filename;
- /* 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 )
+ /* */
+ if( !b_sub && !es_format_IsSimilar( &p_filter->fmt_in, &p_filter->fmt_out ) )
{
- msg_Err( p_vout, "can't open blending filter, aborting" );
- vlc_object_detach( p_sys->p_blend );
- vlc_object_destroy( p_sys->p_blend );
+ msg_Err( p_filter, "Input and output format does not match" );
return VLC_EGENERIC;
}
- if( p_sys->posx < 0 || p_sys->posy < 0 )
- {
- p_sys->posx = 0; p_sys->posy = 0;
+ /* */
+ p_filter->p_sys = p_sys = malloc( sizeof( *p_sys ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- 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;
- }
+ /* */
+ p_sys->p_blend = NULL;
+ if( !b_sub )
+ {
- 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->p_blend = filter_NewBlend( VLC_OBJECT(p_filter),
+ &p_filter->fmt_in.video );
+ if( !p_sys->p_blend )
{
- p_sys->posx = p_vout->render.i_width / 2 - p_sys->i_width / 2;
+ free( p_sys );
+ return VLC_EGENERIC;
}
}
- else
- {
- p_sys->pos = 0;
- }
- /* Try to open the real video output */
- msg_Dbg( p_vout, "spawning the real video output" );
+ /* */
+ config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
+ p_filter->p_cfg );
- p_sys->p_vout = vout_Create( p_vout, &fmt );
+ /* */
+ logo_list_t *p_list = &p_sys->list;
- /* Everything failed */
- if( 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_sys->p_vout, "mouse-x", MouseEvent, p_vout);
- var_AddCallback( 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" );
- ALLOCATE_DIRECTBUFFERS( VOUT_MAX_PICTURES );
- ADD_CALLBACKS( p_sys->p_vout, SendEvents );
- ADD_PARENT_CALLBACKS( SendEventsToChild );
+ 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" );
- return VLC_SUCCESS;
-}
+ /* 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;
-/*****************************************************************************
- * End: terminate logo video thread output method
- *****************************************************************************/
-static void End( vout_thread_t *p_vout )
-{
- vout_sys_t *p_sys = p_vout->p_sys;
- int i_index;
+ 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;
+
+ for( int i = 0; ppsz_filter_callbacks[i]; i++ )
+ var_AddCallback( p_filter, ppsz_filter_callbacks[i],
+ LogoCallback, p_sys );
- /* Free the fake output buffers we allocated */
- for( i_index = I_OUTPUTPICTURES ; i_index ; )
+ /* Misc init */
+ if( b_sub )
{
- i_index--;
- free( PP_OUTPUTPICTURE[ i_index ]->p_data_orig );
+ p_filter->pf_sub_filter = FilterSub;
}
-
- 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 )
+ else
{
- DEL_CALLBACKS( p_sys->p_vout, SendEvents );
- vlc_object_detach( p_sys->p_vout );
- vout_Destroy( p_sys->p_vout );
+ p_filter->pf_video_filter = FilterVideo;
+ p_filter->pf_video_mouse = Mouse;
}
- 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_destroy( p_sys->p_blend );
+ free( psz_filename );
+ return VLC_SUCCESS;
}
-/*****************************************************************************
- * Destroy: destroy logo video thread output method
- *****************************************************************************/
-static void Destroy( vlc_object_t *p_this )
+/**
+ * Common close function
+ */
+static void Close( vlc_object_t *p_this )
{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- vout_sys_t *p_sys = p_vout->p_sys;
+ filter_t *p_filter = (filter_t *)p_this;
+ filter_sys_t *p_sys = p_filter->p_sys;
- DEL_PARENT_CALLBACKS( SendEventsToChild );
+ for( int i = 0; ppsz_filter_callbacks[i]; i++ )
+ var_DelCallback( p_filter, ppsz_filter_callbacks[i],
+ LogoCallback, p_sys );
- FreeLogoList( p_sys->p_logo_list );
- free( p_sys->p_logo_list );
+ if( p_sys->p_blend )
+ filter_DeleteBlend( p_sys->p_blend );
+ vlc_mutex_destroy( &p_sys->lock );
+ LogoListUnload( &p_sys->list );
free( p_sys );
}
-/*****************************************************************************
- * Render: render the logo onto the video
- *****************************************************************************/
-static void Render( vout_thread_t *p_vout, picture_t *p_inpic )
+/**
+ * Sub filter
+ */
+static subpicture_t *FilterSub( filter_t *p_filter, mtime_t date )
{
- vout_sys_t *p_sys = p_vout->p_sys;
- picture_t *p_outpic;
+ 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_list_t *p_logo_list;
- logo_t * p_logo;
+ logo_t *p_logo;
- p_logo_list = p_sys->p_logo_list;
+ 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_logo_list->i_next_pic < p_inpic->date )
+ if( ( !p_sys->b_spu_update && p_list->i_next_pic > date ) ||
+ !p_list->i_repeat )
{
- /* 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 )
- {
+ vlc_mutex_unlock( &p_sys->lock );
+ return NULL;
+ }
- 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;
+ /* adjust index to the next logo */
+ p_logo = LogoListNext( p_list, date );
+ p_sys->b_spu_update = false;
- 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;
- }
- }
- }
+ p_pic = p_logo->p_pic;
- }
- else
+ /* Allocate the subpicture internal data. */
+ p_spu = filter_NewSubpicture( p_filter );
+ if( !p_spu )
+ goto exit;
+
+ p_spu->b_absolute = p_sys->b_absolute;
+ p_spu->i_start = date;
+ p_spu->i_stop = 0;
+ p_spu->b_ephemer = true;
+
+ /* Send an empty subpicture to clear the display when needed */
+ if( p_list->i_repeat != -1 && p_list->i_counter == 0 )
{
- p_logo = &p_logo_list->p_logo[p_sys->p_logo_list->i_counter];
- p_pic = p_logo->p_pic;
+ 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;
- /* This is a new frame. Get a structure from the video_output. */
- while( !(p_outpic = vout_CreatePicture( p_sys->p_vout, 0, 0, 0 )) )
+ /* 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 )
{
- if( p_vout->b_die || p_vout->b_error ) return;
- msleep( VOUT_OUTMEM_SLEEP );
+ msg_Err( p_filter, "cannot allocate SPU region" );
+ p_filter->pf_sub_buffer_del( p_filter, p_spu );
+ p_spu = NULL;
+ goto exit;
}
- vout_CopyPicture( p_vout, p_outpic, p_inpic );
- vout_DatePicture( p_sys->p_vout, p_outpic, p_inpic->date );
+ /* */
+ picture_Copy( p_region->p_picture, p_pic );
- 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 );
+ /* 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;
+ }
- vout_DisplayPicture( p_sys->p_vout, p_outpic );
-}
+ p_region->i_x = p_sys->i_pos_x;
+ p_region->i_y = p_sys->i_pos_y;
-/*****************************************************************************
- * SendEvents: forward mouse and keyboard events to the parent p_vout
- *****************************************************************************/
-static int SendEvents( 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 );
- return VLC_SUCCESS;
+ p_spu->p_region = p_region;
+
+ p_spu->i_alpha = ( p_logo->i_alpha != -1 ?
+ p_logo->i_alpha : p_list->i_alpha );
+
+exit:
+ vlc_mutex_unlock( &p_sys->lock );
+
+ return p_spu;
}
-/*****************************************************************************
- * 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 )
+/**
+ * Video filter
+ */
+static picture_t *FilterVideo( filter_t *p_filter, picture_t *p_src )
{
- 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;
+ filter_sys_t *p_sys = p_filter->p_sys;
+ logo_list_t *p_list = &p_sys->list;
- var_Get( p_vout->p_sys->p_vout, "mouse-button-down", &valb );
+ picture_t *p_dst = filter_NewPicture( p_filter );
+ if( !p_dst )
+ goto exit;
- i_delta = newval.i_int - oldval.i_int;
+ picture_Copy( p_dst, p_src );
- if( (valb.i_int & 0x1) == 0 )
- {
- return VLC_SUCCESS;
- }
+ /* */
+ vlc_mutex_lock( &p_sys->lock );
+
+ 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 );
- if( psz_var[6] == 'x' )
+ /* */
+ const picture_t *p_pic = p_logo->p_pic;
+ if( p_pic )
{
- vlc_value_t valy;
- var_Get( p_vout->p_sys->p_vout, "mouse-y", &valy );
- 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) )
+ 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_sys->i_pos )
{
- p_sys->posx = __MIN( __MAX( p_sys->posx + i_delta, 0 ),
- p_vout->output.i_width - p_sys->i_width );
+ if( p_sys->i_pos & SUBPICTURE_ALIGN_BOTTOM )
+ {
+ p_sys->i_pos_y = i_dst_h - p_fmt->i_visible_height;
+ }
+ else if ( !(p_sys->i_pos & SUBPICTURE_ALIGN_TOP) )
+ {
+ p_sys->i_pos_y = ( i_dst_h - p_fmt->i_visible_height ) / 2;
+ }
+ else
+ {
+ p_sys->i_pos_y = 0;
+ }
+
+ 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
+ {
+ p_sys->i_pos_x = 0;
+ }
}
- }
- 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)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) )
+
+ /* */
+ 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 ) )
{
- p_sys->posy = __MIN( __MAX( p_sys->posy + i_delta, 0 ),
- p_vout->output.i_height - p_sys->i_height );
+ msg_Err( p_filter, "failed to blend a picture" );
}
}
+ vlc_mutex_unlock( &p_sys->lock );
- return VLC_SUCCESS;
+exit:
+ picture_Release( p_src );
+ return p_dst;
}
-/*****************************************************************************
- * Control: control facility for the vout (forwards to child vout)
- *****************************************************************************/
-static int Control( vout_thread_t *p_vout, int i_query, va_list args )
+static int Mouse( filter_t *p_filter, vlc_mouse_t *p_mouse,
+ const vlc_mouse_t *p_old, const vlc_mouse_t *p_new )
{
- return vout_vaControl( p_vout->p_sys->p_vout, i_query, args );
-}
+ filter_sys_t *p_sys = p_filter->p_sys;
-/*****************************************************************************
- * 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 )
-{
- vout_thread_t *p_vout = (vout_thread_t *)p_this;
- var_Set( p_vout->p_sys->p_vout, psz_var, newval );
- return VLC_SUCCESS;
-}
+ vlc_mutex_lock( &p_sys->lock );
+ logo_t *p_logo = LogoListCurrent( &p_sys->list );
+ const picture_t *p_pic = p_logo->p_pic;
-/*****************************************************************************
- * filter_sys_t: logo filter descriptor
- *****************************************************************************/
-struct filter_sys_t
-{
- logo_list_t *p_logo_list;
+ 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;
- int pos, posx, posy;
+ /* 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;
- vlc_bool_t b_absolute;
- mtime_t i_last_date;
+ 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;
- /* On the fly control variable */
- vlc_bool_t b_need_update;
-};
+ 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 );
+ }
-static subpicture_t *Filter( filter_t *, mtime_t );
+ 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;
+}
/*****************************************************************************
- * CreateFilter: allocates logo video filter
+ * Callback to update params on the fly
*****************************************************************************/
-static int CreateFilter( vlc_object_t *p_this )
+static int LogoCallback( vlc_object_t *p_this, char const *psz_var,
+ vlc_value_t oldval, vlc_value_t newval, void *p_data )
{
- filter_t *p_filter = (filter_t *)p_this;
- filter_sys_t *p_sys;
- logo_list_t *p_logo_list;
+ VLC_UNUSED(oldval);
+ filter_sys_t *p_sys = (filter_sys_t *)p_data;
+ logo_list_t *p_list = &p_sys->list;
- /* Allocate structure */
- p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
- if( p_sys == NULL )
+ vlc_mutex_lock( &p_sys->lock );
+ if( !strcmp( psz_var, "logo-file" ) )
{
- msg_Err( p_filter, "out of memory" );
- return VLC_ENOMEM;
+ LogoListUnload( p_list );
+ LogoListLoad( p_this, p_list, newval.psz_string );
}
- p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
- if( p_logo_list == NULL )
+ else if ( !strcmp( psz_var, "logo-x" ) )
{
- msg_Err( p_filter, "out of memory" );
- free( p_sys );
- return VLC_ENOMEM;
+ p_sys->i_pos_x = newval.i_int;
}
-
- 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 )
+ else if ( !strcmp( psz_var, "logo-y" ) )
{
- msg_Err( p_this, "logo file not specified" );
- free( p_sys );
- free( p_logo_list );
- return VLC_EGENERIC;
+ 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 );
- 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 );
+ return VLC_SUCCESS;
+}
- vlc_mutex_init( p_filter, &p_logo_list->lock );
- vlc_mutex_lock( &p_logo_list->lock );
+/**
+ * It loads the logo image into memory.
+ */
+static picture_t *LoadImage( vlc_object_t *p_this, const char *psz_filename )
+{
+ if( !psz_filename )
+ return NULL;
- LoadLogoList( p_this, p_logo_list );
+ video_format_t fmt_in;
+ video_format_Init( &fmt_in, 0 );
- vlc_mutex_unlock( &p_logo_list->lock );
+ video_format_t fmt_out;
+ video_format_Init( &fmt_out, VLC_CODEC_YUVA );
- /* Misc init */
- p_filter->pf_sub_filter = Filter;
- p_sys->b_need_update = VLC_TRUE;
+ image_handler_t *p_image = image_HandlerCreate( p_this );
+ if( !p_image )
+ return NULL;
- p_sys->i_last_date = 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 VLC_SUCCESS;
+ return p_pic;
}
-/*****************************************************************************
- * DestroyFilter: destroy logo video filter
- *****************************************************************************/
-static void DestroyFilter( vlc_object_t *p_this )
+/**
+ * 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 )
{
- 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_global , "logo-file" );
- var_Destroy( p_filter->p_libvlc_global , "logo-x" );
- var_Destroy( p_filter->p_libvlc_global , "logo-y" );
- var_Destroy( p_filter->p_libvlc_global , "logo-delay" );
- var_Destroy( p_filter->p_libvlc_global , "logo-repeat" );
- var_Destroy( p_filter->p_libvlc_global , "logo-position" );
- var_Destroy( p_filter->p_libvlc_global , "logo-transparency" );
-}
+ char *psz_list; /* the list: <logo>[,[<delay>[,[<alpha>]]]][;...] */
+ char *psz_original;
+ unsigned int i;
+ logo_t *p_logo; /* the parsing's result */
-/*****************************************************************************
- * 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;
+ p_logo_list->i_counter = 0;
+ p_logo_list->i_next_pic = 0;
- 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 */
+ psz_original = psz_list = strdup( psz_filename );
+ if( !psz_list )
+ abort();
- if( ( ( !p_sys->b_need_update ) && ( p_logo_list->i_next_pic > date ) )
- || !p_logo_list->i_repeat )
+ /* Count the number logos == number of ';' + 1 */
+ p_logo_list->i_count = 1;
+ for( i = 0; i < strlen( psz_list ); i++ )
{
- vlc_mutex_unlock( &p_logo_list->lock );
- return 0;
+ if( psz_list[i] == ';' )
+ p_logo_list->i_count++;
}
- /* 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;
+ p_logo_list->p_logo =
+ p_logo = calloc( p_logo_list->i_count, sizeof(*p_logo) );
+ if( !p_logo )
+ abort();
- /* Allocate the subpicture internal data. */
- p_spu = p_filter->pf_sub_buffer_new( p_filter );
- if( !p_spu )
+ /* Fill the data */
+ for( i = 0; i < p_logo_list->i_count; i++ )
{
- vlc_mutex_unlock( &p_logo_list->lock );
- return NULL;
- }
+ char *p_c = strchr( psz_list, ';' );
+ char *p_c2 = strchr( psz_list, ',' );
- 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 = VLC_TRUE;
+ p_logo[i].i_alpha = -1; /* use default settings */
+ p_logo[i].i_delay = -1; /* use default settings */
- p_sys->b_need_update = VLC_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_c2 && ( p_c2 < p_c || !p_c ) )
+ {
+ /* <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
+ {
+ /* <logo> type */
+ if( p_c )
+ *p_c = '\0';
+ }
- 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 )
+ 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 )
{
- vlc_mutex_unlock( &p_logo_list->lock );
- return p_spu;
+ msg_Warn( p_this, "error while loading logo %s, will be skipped",
+ psz_list );
}
- }
- 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;
+ if( p_c )
+ psz_list = &p_c[1];
}
- /* 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;
- }
+ /* initialize so that on the first update it will wrap back to 0 */
+ p_logo_list->i_counter = p_logo_list->i_count - 1;
- vout_CopyPicture( p_filter, &p_region->picture, p_pic );
- vlc_mutex_unlock( &p_logo_list->lock );
+ free( psz_original );
+}
- /* where to locate the logo: */
- if( p_sys->posx < 0 || p_sys->posy < 0 )
- { /* set to one of the 9 relative locations */
- p_region->i_align = p_sys->pos;
- p_spu->i_x = 0;
- p_spu->i_y = 0;
- p_spu->b_absolute = VLC_FALSE;
- }
- else
- { /* set to an absolute xy, referenced to upper left corner */
- p_region->i_align = OSD_ALIGN_LEFT | OSD_ALIGN_TOP;
- p_spu->i_x = p_sys->posx;
- p_spu->i_y = p_sys->posy;
- p_spu->b_absolute = VLC_TRUE;
+/**
+ * Unload a list of logo and release associated ressources.
+ */
+static void LogoListUnload( logo_list_t *p_list )
+{
+ 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 );
+}
- p_spu->p_region = p_region;
+/**
+ * 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;
- p_spu->i_alpha = ( p_logo->i_alpha != -1 ?
- p_logo->i_alpha : p_logo_list->i_alpha );
+ logo_t *p_logo = LogoListCurrent( p_list );
- return p_spu;
+ p_list->i_next_pic = i_date + ( p_logo->i_delay != -1 ?
+ p_logo->i_delay : p_list->i_delay ) * 1000;
+ return p_logo;
}
-
-/*****************************************************************************
- * 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 )
+/**
+ * Return the current logo pointer
+ */
+static logo_t *LogoListCurrent( logo_list_t *p_list )
{
- 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 = VLC_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 = VLC_TRUE;
- return VLC_SUCCESS;
+ return &p_list->p_logo[p_list->i_counter];
}
+
projects / vlc / blobdiff