/*****************************************************************************
* mosaic.c : Mosaic video plugin for vlc
*****************************************************************************
- * Copyright (C) 2004-2008 the VideoLAN team
+ * Copyright (C) 2004-2008 VLC authors and VideoLAN
* $Id$
*
* Authors: Antoine Cellerier <dionoea at videolan dot org>
* Christophe Massiot <massiot@via.ecp.fr>
*
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
struct filter_sys_t
{
vlc_mutex_t lock; /* Internal filter lock */
- vlc_mutex_t *p_lock; /* Pointer to mosaic bridge lock */
image_handler_t *p_image;
#define ROWS_TEXT N_("Number of rows")
#define ROWS_LONGTEXT N_( \
"Number of image rows in the mosaic (only used if " \
- "positionning method is set to \"fixed\")." )
+ "positioning method is set to \"fixed\")." )
#define COLS_TEXT N_("Number of columns")
#define COLS_LONGTEXT N_( \
"Number of image columns in the mosaic (only used if " \
- "positionning method is set to \"fixed\"." )
+ "positioning method is set to \"fixed\"." )
#define AR_TEXT N_("Keep aspect ratio")
#define AR_LONGTEXT N_( \
#define CFG_PREFIX "mosaic-"
vlc_module_begin ()
- set_description( N_("Mosaic video sub filter") )
+ set_description( N_("Mosaic video sub source") )
set_shortname( N_("Mosaic") )
set_category( CAT_VIDEO )
set_subcategory( SUBCAT_VIDEO_SUBPIC)
- set_capability( "sub filter", 0 )
+ set_capability( "sub source", 0 )
set_callbacks( CreateFilter, DestroyFilter )
- add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
+ add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255,
ALPHA_TEXT, ALPHA_LONGTEXT, false )
- add_integer( CFG_PREFIX "height", 100, NULL,
+ add_integer( CFG_PREFIX "height", 100,
HEIGHT_TEXT, HEIGHT_LONGTEXT, false )
- add_integer( CFG_PREFIX "width", 100, NULL,
+ add_integer( CFG_PREFIX "width", 100,
WIDTH_TEXT, WIDTH_LONGTEXT, false )
- add_integer( CFG_PREFIX "align", 5, NULL,
+ add_integer( CFG_PREFIX "align", 5,
ALIGN_TEXT, ALIGN_LONGTEXT, true)
- change_integer_list( pi_align_values, ppsz_align_descriptions, NULL )
+ change_integer_list( pi_align_values, ppsz_align_descriptions )
- add_integer( CFG_PREFIX "xoffset", 0, NULL,
+ add_integer( CFG_PREFIX "xoffset", 0,
XOFFSET_TEXT, XOFFSET_LONGTEXT, true )
- add_integer( CFG_PREFIX "yoffset", 0, NULL,
+ add_integer( CFG_PREFIX "yoffset", 0,
YOFFSET_TEXT, YOFFSET_LONGTEXT, true )
- add_integer( CFG_PREFIX "borderw", 0, NULL,
+ add_integer( CFG_PREFIX "borderw", 0,
BORDERW_TEXT, BORDERW_LONGTEXT, true )
- add_deprecated_alias( CFG_PREFIX "vborder" )
- add_integer( CFG_PREFIX "borderh", 0, NULL,
+ add_integer( CFG_PREFIX "borderh", 0,
BORDERH_TEXT, BORDERH_LONGTEXT, true )
- add_deprecated_alias( CFG_PREFIX "hborder" )
- add_integer( CFG_PREFIX "position", 0, NULL,
+ add_integer( CFG_PREFIX "position", 0,
POS_TEXT, POS_LONGTEXT, false )
- change_integer_list( pi_pos_values, ppsz_pos_descriptions, NULL )
- add_integer( CFG_PREFIX "rows", 2, NULL,
+ change_integer_list( pi_pos_values, ppsz_pos_descriptions )
+ add_integer( CFG_PREFIX "rows", 2,
ROWS_TEXT, ROWS_LONGTEXT, false )
- add_integer( CFG_PREFIX "cols", 2, NULL,
+ add_integer( CFG_PREFIX "cols", 2,
COLS_TEXT, COLS_LONGTEXT, false )
- add_bool( CFG_PREFIX "keep-aspect-ratio", false, NULL,
+ add_bool( CFG_PREFIX "keep-aspect-ratio", false,
AR_TEXT, AR_LONGTEXT, false )
- add_bool( CFG_PREFIX "keep-picture", false, NULL,
+ add_bool( CFG_PREFIX "keep-picture", false,
KEEP_TEXT, KEEP_LONGTEXT, false )
- add_string( CFG_PREFIX "order", "", NULL,
+ add_string( CFG_PREFIX "order", "",
ORDER_TEXT, ORDER_LONGTEXT, false )
- add_string( CFG_PREFIX "offsets", "", NULL,
+ add_string( CFG_PREFIX "offsets", "",
OFFSETS_TEXT, OFFSETS_LONGTEXT, false )
- add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT,
+ add_integer( CFG_PREFIX "delay", 0, DELAY_TEXT, DELAY_LONGTEXT,
false )
vlc_module_end ()
* parse the "--mosaic-offsets x1,y1,x2,y2,x3,y3" parameter
* and set the corresponding struct filter_sys_t entries.
*****************************************************************************/
-#define mosaic_ParseSetOffsets( a, b, c ) \
- __mosaic_ParseSetOffsets( VLC_OBJECT( a ), b, c )
-static void __mosaic_ParseSetOffsets( vlc_object_t *p_this,
+static void mosaic_ParseSetOffsets( vlc_object_t *p_this,
filter_sys_t *p_sys,
char *psz_offsets )
{
p_sys->i_offsets_length = i_index;
}
}
+#define mosaic_ParseSetOffsets( a, b, c ) \
+ mosaic_ParseSetOffsets( VLC_OBJECT( a ), b, c )
/*****************************************************************************
* CreateFiler: allocate mosaic video filter
{
filter_t *p_filter = (filter_t *)p_this;
filter_sys_t *p_sys;
- vlc_object_t *p_libvlc = VLC_OBJECT( p_filter->p_libvlc );
char *psz_order, *_psz_order;
char *psz_offsets;
int i_index;
- vlc_value_t val;
int i_command;
- /* The mosaic thread is more important than the decoder threads */
- vlc_thread_set_priority( p_this, VLC_THREAD_PRIORITY_OUTPUT );
-
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_sys == NULL )
return VLC_ENOMEM;
- p_filter->pf_sub_filter = Filter;
+ p_filter->pf_sub_source = Filter;
vlc_mutex_init( &p_sys->lock );
vlc_mutex_lock( &p_sys->lock );
- var_Create( p_libvlc, "mosaic-lock", VLC_VAR_MUTEX );
- var_Get( p_libvlc, "mosaic-lock", &val );
- p_sys->p_lock = val.p_address;
-
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
#define GET_VAR( name, min, max ) \
i_command = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ); \
- p_sys->i_##name = __MIN( max, __MAX( min, i_command ) ); \
+ p_sys->i_##name = VLC_CLIP( i_command, min, max ); \
var_AddCallback( p_filter, CFG_PREFIX #name, MosaicCallback, p_sys );
GET_VAR( width, 0, INT_MAX );
filter_sys_t *p_sys = p_filter->p_sys;
bridge_t *p_bridge;
- subpicture_t *p_spu;
-
int i_index, i_real_index, i_row, i_col;
int i_greatest_real_index_used = p_sys->i_order_length - 1;
subpicture_region_t *p_region_prev = NULL;
/* Allocate the subpicture internal data. */
- p_spu = filter_NewSubpicture( p_filter );
+ subpicture_t *p_spu = filter_NewSubpicture( p_filter );
if( !p_spu )
return NULL;
p_spu->i_alpha = p_sys->i_alpha;
p_spu->b_absolute = false;
+ p_spu->i_original_picture_width = p_sys->i_width;
+ p_spu->i_original_picture_height = p_sys->i_height;
+
vlc_mutex_lock( &p_sys->lock );
- vlc_mutex_lock( p_sys->p_lock );
+ vlc_global_lock( VLC_MOSAIC_MUTEX );
p_bridge = GetBridge( p_filter );
if ( p_bridge == NULL )
{
- vlc_mutex_unlock( p_sys->p_lock );
+ vlc_global_unlock( VLC_MOSAIC_MUTEX );
vlc_mutex_unlock( &p_sys->lock );
return p_spu;
}
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_sys->p_lock );
+ subpicture_Delete( p_spu );
+ vlc_global_unlock( VLC_MOSAIC_MUTEX );
vlc_mutex_unlock( &p_sys->lock );
- return p_spu;
+ return NULL;
}
if( p_es->i_x >= 0 && p_es->i_y >= 0 )
p_region_prev = p_region;
}
- vlc_mutex_unlock( p_sys->p_lock );
+ vlc_global_unlock( VLC_MOSAIC_MUTEX );
vlc_mutex_unlock( &p_sys->lock );
return p_spu;
vlc_mutex_lock( &p_sys->lock );
msg_Dbg( p_this, "changing alpha from %d/255 to %d/255",
p_sys->i_alpha, (int)newval.i_int);
- p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 );
+ p_sys->i_alpha = VLC_CLIP( newval.i_int, 0, 255 );
vlc_mutex_unlock( &p_sys->lock );
}
else if( VAR_IS( "height" ) )
else if( VAR_IS( "xoffset" ) )
{
vlc_mutex_lock( &p_sys->lock );
- msg_Dbg( p_this, "changing x offset from %dpx to %px",
+ msg_Dbg( p_this, "changing x offset from %dpx to %dpx",
p_sys->i_xoffset, (int)newval.i_int );
p_sys->i_xoffset = __MAX( newval.i_int, 0 );
vlc_mutex_unlock( &p_sys->lock );
{
int i_old = 0, i_new = 0;
vlc_mutex_lock( &p_sys->lock );
- newval.i_int = __MIN( __MAX( newval.i_int, 0 ), 10 );
+ newval.i_int = VLC_CLIP( newval.i_int, 0, 10 );
if( newval.i_int == 3 || newval.i_int == 7 )
newval.i_int = 5;
while( pi_align_values[i_old] != p_sys->i_align ) i_old++;
projects / vlc / blobdiff