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,
add_integer( CFG_PREFIX "borderw", 0,
BORDERW_TEXT, BORDERW_LONGTEXT, true )
- add_deprecated_alias( CFG_PREFIX "vborder" )
add_integer( CFG_PREFIX "borderh", 0,
BORDERH_TEXT, BORDERH_LONGTEXT, true )
- add_deprecated_alias( CFG_PREFIX "hborder" )
add_integer( CFG_PREFIX "position", 0,
POS_TEXT, POS_LONGTEXT, false )
* 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;
/* Allocate structure */
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 );
p_spu->b_absolute = false;
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;
}
{
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 );
+ vlc_global_unlock( VLC_MOSAIC_MUTEX );
vlc_mutex_unlock( &p_sys->lock );
return p_spu;
}
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;