Skip to content

V
vlc-gpu
Commit 217ab55e authored by Mark Moriarty's avatar Mark Moriarty
Browse files
Options

marq.c -- allow relative positioning, like logo, via --marq-pos

parent 818805e7
Hide whitespace changes
Inline Side-by-side
Showing with 274 additions and 244 deletions
modules/video_filter/marq.c
View file @ 217ab55e
/***************************************************************************** /*****************************************************************************
* marq.c : marquee display video plugin for vlc * marq.c : marquee display video plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2003-2004 VideoLAN * Copyright (C) 2003-2004 VideoLAN
* $Id: time.c 8751 2004-09-20 21:51:41Z gbazin $ * $Id: time.c 8751 2004-09-20 21:51:41Z gbazin $
* *
* Authors: Mark Moriarty * Authors: Mark Moriarty
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*****************************************************************************/ *****************************************************************************/
/***************************************************************************** /*****************************************************************************
* Preamble * Preamble
*****************************************************************************/ *****************************************************************************/
#include <stdlib.h> /* malloc(), free() */ #include <stdlib.h> /* malloc(), free() */
#include <string.h> #include <string.h>
#include <vlc/vlc.h> #include <vlc/vlc.h>
#include <vlc/vout.h> #include <vlc/vout.h>
#include "vlc_filter.h" #include "vlc_filter.h"
#include "vlc_block.h" #include "vlc_block.h"
#include "osd.h" #include "osd.h"
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
static int CreateFilter ( vlc_object_t * ); static int CreateFilter ( vlc_object_t * );
static void DestroyFilter( vlc_object_t * ); static void DestroyFilter( vlc_object_t * );
static subpicture_t *Filter( filter_t *, mtime_t ); static subpicture_t *Filter( filter_t *, mtime_t );
static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var, static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval, vlc_value_t oldval, vlc_value_t newval,
void *p_data ); void *p_data );
/***************************************************************************** /*****************************************************************************
* filter_sys_t: marquee filter descriptor * filter_sys_t: marquee filter descriptor
*****************************************************************************/ *****************************************************************************/
struct filter_sys_t struct filter_sys_t
{ {
int i_xoff, i_yoff; /* offsets for the display string in the video window */ int i_xoff, i_yoff; /* offsets for the display string in the video window */
int i_timeout; int i_pos; /* permit relative positioning (top, bottom, left, right, center) */
int i_timeout;
char *psz_marquee; /* marquee string */
char *psz_marquee; /* marquee string */
time_t last_time;
time_t last_time;
vlc_bool_t b_need_update; vlc_bool_t b_absolute; /* position control, relative vs. absolute */
};
vlc_bool_t b_need_update;
#define MSG_TEXT N_("Marquee text") };
#define MSG_LONGTEXT N_("Marquee text to display")
#define POSX_TEXT N_("X offset, from left") #define MSG_TEXT N_("Marquee text")
#define POSX_LONGTEXT N_("X offset, from the left screen edge" ) #define MSG_LONGTEXT N_("Marquee text to display")
#define POSY_TEXT N_("Y offset, from the top") #define POSX_TEXT N_("X offset, from left")
#define POSY_LONGTEXT N_("Y offset, down from the top" ) #define POSX_LONGTEXT N_("X offset, from the left screen edge" )
#define TIMEOUT_TEXT N_("Marquee timeout") #define POSY_TEXT N_("Y offset, from the top")
#define TIMEOUT_LONGTEXT N_("Defines the time the marquee must remain " \ #define POSY_LONGTEXT N_("Y offset, down from the top" )
"displayed, in milliseconds. Default value is " \ #define TIMEOUT_TEXT N_("Marquee timeout")
"0 (remain forever).") #define TIMEOUT_LONGTEXT N_("Defines the time the marquee must remain " \
"displayed, in milliseconds. Default value is " \
/***************************************************************************** "0 (remain forever).")
* Module descriptor #define POS_TEXT N_("Marquee position")
*****************************************************************************/ #define POS_LONGTEXT N_( \
vlc_module_begin(); "You can enforce the marquee position on the video " \
set_capability( "sub filter", 0 ); "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \
set_shortname( N_("Marquee" )); "also use combinations of these values by adding them).")
set_callbacks( CreateFilter, DestroyFilter );
set_category( CAT_VIDEO ); static int pi_pos_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 };
set_subcategory( SUBCAT_VIDEO_SUBPIC ); static char *ppsz_pos_descriptions[] =
add_string( "marq-marquee", "Marquee", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE ); { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"),
add_integer( "marq-x", 0, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE ); N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") };
add_integer( "marq-y", 0, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
add_integer( "marq-timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT, /*****************************************************************************
VLC_FALSE ); * Module descriptor
set_description( _("Marquee display sub filter") ); *****************************************************************************/
add_shortcut( "marq" ); vlc_module_begin();
vlc_module_end(); set_capability( "sub filter", 0 );
set_shortname( N_("Marquee" ));
/***************************************************************************** set_callbacks( CreateFilter, DestroyFilter );
* CreateFilter: allocates marquee video filter set_category( CAT_VIDEO );
*****************************************************************************/ set_subcategory( SUBCAT_VIDEO_SUBPIC );
static int CreateFilter( vlc_object_t *p_this ) add_string( "marq-marquee", "Marquee", NULL, MSG_TEXT, MSG_LONGTEXT, VLC_FALSE );
{ add_integer( "marq-x", -1, NULL, POSX_TEXT, POSX_LONGTEXT, VLC_FALSE );
filter_t *p_filter = (filter_t *)p_this; add_integer( "marq-y", -1, NULL, POSY_TEXT, POSY_LONGTEXT, VLC_FALSE );
filter_sys_t *p_sys; add_integer( "marq-timeout", 0, NULL, TIMEOUT_TEXT, TIMEOUT_LONGTEXT,
vlc_object_t *p_input; VLC_FALSE );
add_integer( "marq-position", 5, NULL, POS_TEXT, POS_LONGTEXT, VLC_TRUE );
/* Allocate structure */ /* 5 sets the default to top [1] left [4] */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 );
if( p_sys == NULL ) set_description( _("Marquee display sub filter") );
{ add_shortcut( "marq" );
msg_Err( p_filter, "out of memory" ); vlc_module_end();
return VLC_ENOMEM;
} /*****************************************************************************
* CreateFilter: allocates marquee video filter
/* Hook used for callback variables */ *****************************************************************************/
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); static int CreateFilter( vlc_object_t *p_this )
if( !p_input ) {
{ filter_t *p_filter = (filter_t *)p_this;
return VLC_ENOOBJ; filter_sys_t *p_sys;
} vlc_object_t *p_input;
p_sys->i_xoff = var_CreateGetInteger( p_input->p_libvlc , "marq-x" ); /* Allocate structure */
p_sys->i_yoff = var_CreateGetInteger( p_input->p_libvlc , "marq-y" ); p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
p_sys->i_timeout = var_CreateGetInteger( p_input->p_libvlc , "marq-timeout" ); if( p_sys == NULL )
p_sys->psz_marquee = var_CreateGetString( p_input->p_libvlc, "marq-marquee" ); {
msg_Err( p_filter, "out of memory" );
var_AddCallback( p_input->p_libvlc, "marq-x", MarqueeCallback, p_sys ); return VLC_ENOMEM;
var_AddCallback( p_input->p_libvlc, "marq-y", MarqueeCallback, p_sys ); }
var_AddCallback( p_input->p_libvlc, "marq-marquee", MarqueeCallback, p_sys );
var_AddCallback( p_input->p_libvlc, "marq-timeout", MarqueeCallback, p_sys ); /* Hook used for callback variables */
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
vlc_object_release( p_input ); if( !p_input )
{
/* Misc init */ return VLC_ENOOBJ;
p_filter->pf_sub_filter = Filter; }
p_sys->last_time = ((time_t)-1);
p_sys->b_need_update = VLC_TRUE; p_sys->i_xoff = var_CreateGetInteger( p_input->p_libvlc , "marq-x" );
p_sys->i_yoff = var_CreateGetInteger( p_input->p_libvlc , "marq-y" );
return VLC_SUCCESS; p_sys->i_timeout = var_CreateGetInteger( p_input->p_libvlc , "marq-timeout" );
} p_sys->i_pos = var_CreateGetInteger( p_input->p_libvlc , "marq-position" );
/***************************************************************************** p_sys->psz_marquee = var_CreateGetString( p_input->p_libvlc, "marq-marquee" );
* DestroyFilter: destroy marquee video filter
*****************************************************************************/ var_AddCallback( p_input->p_libvlc, "marq-x", MarqueeCallback, p_sys );
static void DestroyFilter( vlc_object_t *p_this ) var_AddCallback( p_input->p_libvlc, "marq-y", MarqueeCallback, p_sys );
{ var_AddCallback( p_input->p_libvlc, "marq-marquee", MarqueeCallback, p_sys );
filter_t *p_filter = (filter_t *)p_this; var_AddCallback( p_input->p_libvlc, "marq-timeout", MarqueeCallback, p_sys );
filter_sys_t *p_sys = p_filter->p_sys; var_AddCallback( p_input->p_libvlc, "marq-position", MarqueeCallback, p_sys );
vlc_object_t *p_input;
vlc_object_release( p_input );
if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
free( p_sys ); p_sys->b_absolute = VLC_TRUE;
if( p_sys->i_xoff < 0 || p_sys->i_yoff < 0 )
/* Delete the marquee variables from playlist */ {
p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE ); p_sys->b_absolute = VLC_FALSE;
if( !p_input ) p_sys->i_xoff = 0; p_sys->i_yoff = 0;
{ }
return;
} /* Misc init */
var_Destroy( p_input->p_libvlc , "marq-marquee" ); p_filter->pf_sub_filter = Filter;
var_Destroy( p_input->p_libvlc , "marq-x" ); p_sys->last_time = ((time_t)-1);
var_Destroy( p_input->p_libvlc , "marq-y" ); p_sys->b_need_update = VLC_TRUE;
var_Destroy( p_input->p_libvlc , "marq-timeout" );
vlc_object_release( p_input ); return VLC_SUCCESS;
} }
/*****************************************************************************
/**************************************************************************** * DestroyFilter: destroy marquee video filter
* Filter: the whole thing *****************************************************************************/
**************************************************************************** static void DestroyFilter( vlc_object_t *p_this )
* This function outputs subpictures at regular time intervals. {
****************************************************************************/ filter_t *p_filter = (filter_t *)p_this;
static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) filter_sys_t *p_sys = p_filter->p_sys;
{ vlc_object_t *p_input;
filter_sys_t *p_sys = p_filter->p_sys;
subpicture_t *p_spu; if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
video_format_t fmt; free( p_sys );
time_t t;
/* Delete the marquee variables from playlist */
if( p_sys->last_time == time( NULL ) ) p_input = vlc_object_find( p_this, VLC_OBJECT_INPUT, FIND_ANYWHERE );
{ if( !p_input )
return NULL; {
} return;
}
if( p_sys->b_need_update == VLC_FALSE ) var_Destroy( p_input->p_libvlc , "marq-marquee" );
{ var_Destroy( p_input->p_libvlc , "marq-x" );
return NULL; var_Destroy( p_input->p_libvlc , "marq-y" );
} var_Destroy( p_input->p_libvlc , "marq-timeout" );
var_Destroy( p_input->p_libvlc , "marq-position" );
p_spu = p_filter->pf_sub_buffer_new( p_filter ); vlc_object_release( p_input );
if( !p_spu ) return NULL; }
memset( &fmt, 0, sizeof(video_format_t) ); /****************************************************************************
fmt.i_chroma = VLC_FOURCC('T','E','X','T'); * Filter: the whole thing
fmt.i_aspect = 0; ****************************************************************************
fmt.i_width = fmt.i_height = 0; * This function outputs subpictures at regular time intervals.
fmt.i_x_offset = 0; ****************************************************************************/
fmt.i_y_offset = 0; static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
{
p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_filter), &fmt ); filter_sys_t *p_sys = p_filter->p_sys;
if( !p_spu->p_region ) subpicture_t *p_spu;
{ video_format_t fmt;
p_filter->pf_sub_buffer_del( p_filter, p_spu ); time_t t;
return NULL;
} if( p_sys->last_time == time( NULL ) )
{
t = p_sys->last_time = time( NULL ); return NULL;
}
p_spu->p_region->psz_text = strdup(p_sys->psz_marquee);
p_spu->i_start = date; if( p_sys->b_need_update == VLC_FALSE )
p_spu->i_stop = p_sys->i_timeout == 0 ? 0 : date + p_sys->i_timeout * 1000; {
p_spu->b_ephemer = VLC_TRUE; return NULL;
p_spu->b_absolute = VLC_FALSE; }
p_spu->i_x = p_sys->i_xoff;
p_spu->i_y = p_sys->i_yoff; p_spu = p_filter->pf_sub_buffer_new( p_filter );
if( !p_spu ) return NULL;
p_spu->i_flags = OSD_ALIGN_LEFT|OSD_ALIGN_TOP ;
p_spu->b_absolute = p_sys->b_absolute;
p_sys->b_need_update = VLC_FALSE; memset( &fmt, 0, sizeof(video_format_t) );
return p_spu; fmt.i_chroma = VLC_FOURCC('T','E','X','T');
} fmt.i_aspect = 0;
fmt.i_width = fmt.i_height = 0;
/********************************************************************** fmt.i_x_offset = 0;
* Callback to update params on the fly fmt.i_y_offset = 0;
**********************************************************************/
static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var, p_spu->p_region = p_spu->pf_create_region( VLC_OBJECT(p_filter), &fmt );
vlc_value_t oldval, vlc_value_t newval, if( !p_spu->p_region )
void *p_data ) {
{ p_filter->pf_sub_buffer_del( p_filter, p_spu );
filter_sys_t *p_sys = (filter_sys_t *) p_data; return NULL;
}
if( !strncmp( psz_var, "marq-marquee", 7 ) )
{ t = p_sys->last_time = time( NULL );
if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
p_sys->psz_marquee = strdup( newval.psz_string ); p_spu->p_region->psz_text = strdup(p_sys->psz_marquee);
} p_spu->i_start = date;
else if ( !strncmp( psz_var, "marq-x", 6 ) ) p_spu->i_stop = p_sys->i_timeout == 0 ? 0 : date + p_sys->i_timeout * 1000;
{ p_spu->b_ephemer = VLC_TRUE;
p_sys->i_xoff = newval.i_int; p_spu->i_x = p_sys->i_xoff;
} p_spu->i_y = p_sys->i_yoff;
else if ( !strncmp( psz_var, "marq-y", 6 ) )
{ p_spu->i_flags = p_sys->i_pos;
p_sys->i_yoff = newval.i_int;
} p_sys->b_need_update = VLC_FALSE;
else if ( !strncmp( psz_var, "marq-timeout", 12 ) ) return p_spu;
{ }
p_sys->i_timeout = newval.i_int;
} /**********************************************************************
p_sys->b_need_update = VLC_TRUE; * Callback to update params on the fly
return VLC_SUCCESS; **********************************************************************/
} static int MarqueeCallback( vlc_object_t *p_this, char const *psz_var,
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
filter_sys_t *p_sys = (filter_sys_t *) p_data;
if( !strncmp( psz_var, "marq-marquee", 7 ) )
{
if( p_sys->psz_marquee ) free( p_sys->psz_marquee );
p_sys->psz_marquee = strdup( newval.psz_string );
}
else if ( !strncmp( psz_var, "marq-x", 6 ) )
{
p_sys->i_xoff = newval.i_int;
}
else if ( !strncmp( psz_var, "marq-y", 6 ) )
{
p_sys->i_yoff = newval.i_int;
}
else if ( !strncmp( psz_var, "marq-timeout", 12 ) )
{
p_sys->i_timeout = newval.i_int;
}
else if ( !strncmp( psz_var, "marq-position", 8 ) )
/* willing to accept a match against marq-pos */
{
p_sys->i_pos = newval.i_int;
}
p_sys->b_need_update = VLC_TRUE;
return VLC_SUCCESS;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment