X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=8b69a177009a4e273a1288233f5888014e3a81d6;hb=1360a812c7f40bf8e5c2caaaffaab6cf4aaa8271;hp=4dc35e0e8cfc8b191212daf98d808356f5f83e84;hpb=f485214f09dd284cbb85674e937fbbb0a6032a2e;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 4dc35e0e8c..8b69a17700 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -25,12 +25,13 @@ /***************************************************************************** * Preamble *****************************************************************************/ +#define _GNU_SOURCE #include /* malloc(), free() */ #include #include #include -#include +#include #ifdef HAVE_LIMITS_H # include /* INT_MAX */ @@ -72,7 +73,7 @@ struct filter_sys_t int i_cols, i_rows; /* mosaic rows and cols */ int i_align; /* mosaic alignment in background video */ int i_xoffset, i_yoffset; /* top left corner offset */ - int i_vborder, i_hborder; /* border width/height between miniatures */ + int i_borderw, i_borderh; /* border width/height between miniatures */ int i_alpha; /* subfilter alpha blending */ vlc_bool_t b_bs; /* Bluescreen vars */ @@ -81,6 +82,10 @@ struct filter_sys_t char **ppsz_order; /* list of picture-id */ int i_order_length; + int *pi_x_offsets; /* list of substreams x offsets */ + int *pi_y_offsets; /* list of substreams y offsets */ + int i_offsets_length; + mtime_t i_delay; }; @@ -100,12 +105,10 @@ struct filter_sys_t #define XOFFSET_LONGTEXT N_("X Coordinate of the top-left corner of the mosaic.") #define YOFFSET_TEXT N_("Top left corner Y coordinate") #define YOFFSET_LONGTEXT N_("Y Coordinate of the top-left corner of the mosaic.") -#define VBORDER_TEXT N_("Vertical border width") -#define VBORDER_LONGTEXT N_( "Width in pixels of the border than can be "\ - "drawn vertically around the mosaic." ) -#define HBORDER_TEXT N_("Horizontal border width") -#define HBORDER_LONGTEXT N_( "Width in pixels of the border than can "\ - "be drawn horizontally around the mosaic." ) +#define BORDERW_TEXT N_("Border width") +#define BORDERW_LONGTEXT N_( "Width in pixels of the border between miniatures." ) +#define BORDERH_TEXT N_("Border height") +#define BORDERH_LONGTEXT N_( "Height in pixels of the border between miniatures." ) #define ALIGN_TEXT N_("Mosaic alignment" ) #define ALIGN_LONGTEXT N_( \ @@ -116,7 +119,8 @@ struct filter_sys_t #define POS_TEXT N_("Positioning method") #define POS_LONGTEXT N_("Positioning method for the mosaic. auto: " \ "automatically choose the best number of rows and columns. " \ - "fixed: use the user-defined number of rows and columns.") + "fixed: use the user-defined number of rows and columns. " \ + "offsets: use the user-defined offsets for each image." ) /// \bug [String] missing closing parenthesis #define ROWS_TEXT N_("Number of rows") @@ -137,6 +141,11 @@ struct filter_sys_t "the mosaic. You must give a comma-separated list of picture ID(s)." \ "These IDs are assigned in the \"mosaic-bridge\" module." ) +#define OFFSETS_TEXT N_("Offsets in order" ) +#define OFFSETS_LONGTEXT N_( "You can enforce the (x,y) offsets of the elements on " \ + "the mosaic (only used if positioning method is set to \"offsets\"). You " \ + "must give a comma-separated list of coordinates (eg: 10,10,150,10)." ) + #define DELAY_TEXT N_("Delay") #define DELAY_LONGTEXT N_("Pictures coming from the mosaic elements " \ "will be delayed according to this value (in milliseconds). For high " \ @@ -163,59 +172,101 @@ struct filter_sys_t "on color variations for the V plane. A value between 10 and 20 " \ "seems sensible." ) -static int pi_pos_values[] = { 0, 1 }; -static char * ppsz_pos_descriptions[] = -{ N_("auto"), N_("fixed") }; +static int pi_pos_values[] = { 0, 1, 2 }; +static const char * ppsz_pos_descriptions[] = +{ N_("auto"), N_("fixed"), N_("offsets") }; static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static char *ppsz_align_descriptions[] = +static const char *ppsz_align_descriptions[] = { N_("Center"), N_("Left"), N_("Right"), N_("Top"), N_("Bottom"), N_("Top-Left"), N_("Top-Right"), N_("Bottom-Left"), N_("Bottom-Right") }; +#define CFG_PREFIX "mosaic-" vlc_module_begin(); - set_description( N_("Mosaic video sub filter") ); - set_shortname( N_("Mosaic") ); + set_description( _("Mosaic video sub filter") ); + set_shortname( _("Mosaic") ); set_category( CAT_VIDEO ); set_subcategory( SUBCAT_VIDEO_SUBPIC); set_capability( "sub filter", 0 ); set_callbacks( CreateFilter, DestroyFilter ); - add_integer( "mosaic-alpha", 255, NULL, ALPHA_TEXT, ALPHA_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-height", 100, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-width", 100, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-align", 5, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE); + add_integer( CFG_PREFIX "alpha", 255, NULL, ALPHA_TEXT, ALPHA_LONGTEXT, VLC_FALSE ); + add_integer( CFG_PREFIX "height", 100, NULL, HEIGHT_TEXT, HEIGHT_LONGTEXT, VLC_FALSE ); + add_integer( CFG_PREFIX "width", 100, NULL, WIDTH_TEXT, WIDTH_LONGTEXT, VLC_FALSE ); + add_integer( CFG_PREFIX "align", 5, NULL, ALIGN_TEXT, ALIGN_LONGTEXT, VLC_TRUE); change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); - add_integer( "mosaic-xoffset", 0, NULL, XOFFSET_TEXT, XOFFSET_LONGTEXT, VLC_TRUE ); - add_integer( "mosaic-yoffset", 0, NULL, YOFFSET_TEXT, YOFFSET_LONGTEXT, VLC_TRUE ); - add_integer( "mosaic-vborder", 0, NULL, VBORDER_TEXT, VBORDER_LONGTEXT, VLC_TRUE ); - add_integer( "mosaic-hborder", 0, NULL, HBORDER_TEXT, HBORDER_LONGTEXT, VLC_TRUE ); - - add_integer( "mosaic-position", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE ); + add_integer( CFG_PREFIX "xoffset", 0, NULL, XOFFSET_TEXT, XOFFSET_LONGTEXT, VLC_TRUE ); + add_integer( CFG_PREFIX "yoffset", 0, NULL, YOFFSET_TEXT, YOFFSET_LONGTEXT, VLC_TRUE ); + add_integer( CFG_PREFIX "borderw", 0, NULL, BORDERW_TEXT, BORDERW_LONGTEXT, VLC_TRUE ); + add_deprecated( CFG_PREFIX "vborder", VLC_FALSE ); + add_integer( CFG_PREFIX "borderh", 0, NULL, BORDERH_TEXT, BORDERH_LONGTEXT, VLC_TRUE ); + add_deprecated( CFG_PREFIX "hborder", VLC_FALSE ); + + add_integer( CFG_PREFIX "position", 0, NULL, POS_TEXT, POS_LONGTEXT, VLC_FALSE ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); - add_integer( "mosaic-rows", 2, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-cols", 2, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); - add_bool( "mosaic-keep-aspect-ratio", 0, NULL, AR_TEXT, AR_LONGTEXT, VLC_FALSE ); - add_bool( "mosaic-keep-picture", 0, NULL, KEEP_TEXT, KEEP_LONGTEXT, VLC_FALSE ); - add_string( "mosaic-order", "", NULL, ORDER_TEXT, ORDER_LONGTEXT, VLC_FALSE ); - - add_integer( "mosaic-delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT, + add_integer( CFG_PREFIX "rows", 2, NULL, ROWS_TEXT, ROWS_LONGTEXT, VLC_FALSE ); + add_integer( CFG_PREFIX "cols", 2, NULL, COLS_TEXT, COLS_LONGTEXT, VLC_FALSE ); + add_bool( CFG_PREFIX "keep-aspect-ratio", 0, NULL, AR_TEXT, AR_LONGTEXT, VLC_FALSE ); + add_bool( CFG_PREFIX "keep-picture", 0, NULL, KEEP_TEXT, KEEP_LONGTEXT, VLC_FALSE ); + add_string( CFG_PREFIX "order", "", NULL, ORDER_TEXT, ORDER_LONGTEXT, VLC_FALSE ); + add_string( CFG_PREFIX "offsets", "", NULL, OFFSETS_TEXT, OFFSETS_LONGTEXT, VLC_FALSE ); + + add_integer( CFG_PREFIX "delay", 0, NULL, DELAY_TEXT, DELAY_LONGTEXT, VLC_FALSE ); - add_bool( "mosaic-bs", 0, NULL, BLUESCREEN_TEXT, + add_bool( CFG_PREFIX "bs", 0, NULL, BLUESCREEN_TEXT, BLUESCREEN_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-bsu", 120, NULL, BLUESCREENU_TEXT, + add_integer( CFG_PREFIX "bsu", 120, NULL, BLUESCREENU_TEXT, BLUESCREENU_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-bsv", 90, NULL, BLUESCREENV_TEXT, + add_integer( CFG_PREFIX "bsv", 90, NULL, BLUESCREENV_TEXT, BLUESCREENV_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-bsut", 17, NULL, BLUESCREENUTOL_TEXT, + add_integer( CFG_PREFIX "bsut", 17, NULL, BLUESCREENUTOL_TEXT, BLUESCREENUTOL_LONGTEXT, VLC_FALSE ); - add_integer( "mosaic-bsvt", 17, NULL, BLUESCREENVTOL_TEXT, + add_integer( CFG_PREFIX "bsvt", 17, NULL, BLUESCREENVTOL_TEXT, BLUESCREENVTOL_LONGTEXT, VLC_FALSE ); var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX ); vlc_module_end(); +static const char *ppsz_filter_options[] = { + "alpha", "height", "width", "align", "xoffset", "yoffset", + "borderw", "borderh", "position", "rows", "cols", + "keep-aspect-ratio", "keep-picture", "order", "offsets", + "delay", "bs", "bsu", "bsv", "bsut", "bsvt", NULL +}; + +/***************************************************************************** + * mosaic_ParseSetOffsets: + * parse the "--mosaic-offsets x1,y1,x2,y2,x3,y3" parameter + * and set the corresponding struct filter_sys_t entries. + *****************************************************************************/ +static void mosaic_ParseSetOffsets( vlc_object_t *p_this, filter_sys_t *p_sys, char *psz_offsets ) +{ + if( psz_offsets[0] != 0 ) + { + char *psz_end = NULL; + int i_index = 0; + do + { + i_index++; + + p_sys->pi_x_offsets = realloc( p_sys->pi_x_offsets, i_index * sizeof(int) ); + p_sys->pi_x_offsets[i_index - 1] = atoi( psz_offsets ); + psz_end = strchr( psz_offsets, ',' ); + psz_offsets = psz_end + 1; + + p_sys->pi_y_offsets = realloc( p_sys->pi_y_offsets, i_index * sizeof(int) ); + p_sys->pi_y_offsets[i_index - 1] = atoi( psz_offsets ); + psz_end = strchr( psz_offsets, ',' ); + psz_offsets = psz_end + 1; + + msg_Dbg( p_this, CFG_PREFIX "offset: id %d, x=%d, y=%d", i_index, p_sys->pi_x_offsets[i_index - 1], p_sys->pi_y_offsets[i_index - 1] ); + + } while( NULL != psz_end ); + p_sys->i_offsets_length = i_index; + } +} /***************************************************************************** * CreateFiler: allocate mosaic video filter @@ -226,6 +277,7 @@ static int CreateFilter( vlc_object_t *p_this ) filter_sys_t *p_sys; libvlc_global_data_t *p_libvlc_global = p_filter->p_libvlc_global; char *psz_order; + char *psz_offsets; int i_index; vlc_value_t val; @@ -249,44 +301,47 @@ static int CreateFilter( vlc_object_t *p_this ) var_Get( p_libvlc_global, "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 ) \ p_sys->i_##name = __MIN( max, __MAX( min, \ - var_CreateGetInteger( p_filter, "mosaic-" #name ) ) ); \ - var_Destroy( p_filter, "mosaic-" #name ); \ - var_Create( p_libvlc_global, "mosaic-" #name, VLC_VAR_INTEGER ); \ - var_SetInteger( p_libvlc_global, "mosaic-" #name, p_sys->i_##name ); \ - var_AddCallback( p_libvlc_global, "mosaic-" #name, MosaicCallback, p_sys ); + var_CreateGetInteger( p_filter, CFG_PREFIX #name ) ) ); \ + var_Destroy( p_filter, CFG_PREFIX #name ); \ + var_Create( p_libvlc_global, CFG_PREFIX #name, VLC_VAR_INTEGER ); \ + var_SetInteger( p_libvlc_global, CFG_PREFIX #name, p_sys->i_##name ); \ + var_AddCallback( p_libvlc_global, CFG_PREFIX #name, MosaicCallback, p_sys ); GET_VAR( width, 0, INT_MAX ); GET_VAR( height, 0, INT_MAX ); GET_VAR( xoffset, 0, INT_MAX ); GET_VAR( yoffset, 0, INT_MAX ); - p_sys->i_align = __MIN( 10, __MAX( 0, var_CreateGetInteger( p_filter, "mosaic-align" ) ) ); + p_sys->i_align = __MIN( 10, __MAX( 0, var_CreateGetInteger( p_filter, CFG_PREFIX "align" ) ) ); if( p_sys->i_align == 3 || p_sys->i_align == 7 ) p_sys->i_align = 5; - var_Destroy( p_filter, "mosaic-align" ); - var_Create( p_libvlc_global, "mosaic-align", VLC_VAR_INTEGER ); - var_SetInteger( p_libvlc_global, "mosaic-align", p_sys->i_align ); - var_AddCallback( p_libvlc_global, "mosaic-align", MosaicCallback, p_sys ); + var_Destroy( p_filter, CFG_PREFIX "align" ); + var_Create( p_libvlc_global, CFG_PREFIX "align", VLC_VAR_INTEGER ); + var_SetInteger( p_libvlc_global, CFG_PREFIX "align", p_sys->i_align ); + var_AddCallback( p_libvlc_global, CFG_PREFIX "align", MosaicCallback, p_sys ); - GET_VAR( vborder, 0, INT_MAX ); - GET_VAR( hborder, 0, INT_MAX ); + GET_VAR( borderw, 0, INT_MAX ); + GET_VAR( borderh, 0, INT_MAX ); GET_VAR( rows, 1, INT_MAX ); GET_VAR( cols, 1, INT_MAX ); GET_VAR( alpha, 0, 255 ); - GET_VAR( position, 0, 1 ); + GET_VAR( position, 0, 2 ); GET_VAR( delay, 100, INT_MAX ); p_sys->i_delay *= 1000; - p_sys->b_ar = var_CreateGetBool( p_filter, "mosaic-keep-aspect-ratio" ); - var_Destroy( p_filter, "mosaic-keep-aspect-ratio" ); - var_Create( p_libvlc_global, "mosaic-keep-aspect-ratio", VLC_VAR_INTEGER ); - var_SetBool( p_libvlc_global, "mosaic-keep-aspect-ratio", p_sys->b_ar ); - var_AddCallback( p_libvlc_global, "mosaic-keep-aspect-ratio", MosaicCallback, + p_sys->b_ar = var_CreateGetBool( p_filter, CFG_PREFIX "keep-aspect-ratio" ); + var_Destroy( p_filter, CFG_PREFIX "keep-aspect-ratio" ); + var_Create( p_libvlc_global, CFG_PREFIX "keep-aspect-ratio", VLC_VAR_INTEGER ); + var_SetBool( p_libvlc_global, CFG_PREFIX "keep-aspect-ratio", p_sys->b_ar ); + var_AddCallback( p_libvlc_global, CFG_PREFIX "keep-aspect-ratio", MosaicCallback, p_sys ); - p_sys->b_keep = var_CreateGetBool( p_filter, "mosaic-keep-picture" ); + p_sys->b_keep = var_CreateGetBool( p_filter, CFG_PREFIX "keep-picture" ); if ( !p_sys->b_keep ) { p_sys->p_image = image_HandlerCreate( p_filter ); @@ -294,10 +349,10 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_order_length = 0; p_sys->ppsz_order = NULL; - psz_order = var_CreateGetString( p_filter, "mosaic-order" ); + psz_order = var_CreateGetString( p_filter, CFG_PREFIX "order" ); - var_Create( p_libvlc_global, "mosaic-order", VLC_VAR_STRING); - var_AddCallback( p_libvlc_global, "mosaic-order", MosaicCallback, p_sys ); + var_Create( p_libvlc_global, CFG_PREFIX "order", VLC_VAR_STRING); + var_AddCallback( p_libvlc_global, CFG_PREFIX "order", MosaicCallback, p_sys ); if( psz_order[0] != 0 ) { @@ -316,19 +371,30 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_order_length = i_index; } + /* Manage specific offsets for substreams */ + psz_offsets = var_CreateGetString( p_filter, CFG_PREFIX "offsets" ); + var_Destroy( p_filter, CFG_PREFIX "offsets" ); + p_sys->i_offsets_length = 0; + p_sys->pi_x_offsets = NULL; + p_sys->pi_y_offsets = NULL; + mosaic_ParseSetOffsets( (vlc_object_t *) p_filter, p_sys, psz_offsets ); + var_Create( p_libvlc_global, CFG_PREFIX "offsets", VLC_VAR_STRING); + var_SetString( p_libvlc_global, CFG_PREFIX "offsets", psz_offsets ); + var_AddCallback( p_libvlc_global, CFG_PREFIX "offsets", MosaicCallback, p_sys ); + /* Bluescreen specific stuff */ GET_VAR( bsu, 0x00, 0xff ); GET_VAR( bsv, 0x00, 0xff ); GET_VAR( bsut, 0x00, 0xff ); GET_VAR( bsvt, 0x00, 0xff ); - p_sys->b_bs = var_CreateGetBool( p_filter, "mosaic-bs" ); - var_Destroy( p_filter, "mosaic-bs" ); - var_Create( p_libvlc_global, "mosaic-bs", VLC_VAR_INTEGER ); - var_SetBool( p_libvlc_global, "mosaic-bs", p_sys->b_bs ); - var_AddCallback( p_libvlc_global, "mosaic-bs", MosaicCallback, p_sys ); + p_sys->b_bs = var_CreateGetBool( p_filter, CFG_PREFIX "bs" ); + var_Destroy( p_filter, CFG_PREFIX "bs" ); + var_Create( p_libvlc_global, CFG_PREFIX "bs", VLC_VAR_INTEGER ); + var_SetBool( p_libvlc_global, CFG_PREFIX "bs", p_sys->b_bs ); + var_AddCallback( p_libvlc_global, CFG_PREFIX "bs", MosaicCallback, p_sys ); if( p_sys->b_bs && p_sys->b_keep ) { - msg_Warn( p_filter, "mosaic-keep-picture needs to be disabled for" + msg_Warn( p_filter, CFG_PREFIX "keep-picture needs to be disabled for" " bluescreen to work" ); } @@ -362,25 +428,31 @@ static void DestroyFilter( vlc_object_t *p_this ) } free( p_sys->ppsz_order ); } - - var_Destroy( p_libvlc_global, "mosaic-alpha" ); - var_Destroy( p_libvlc_global, "mosaic-height" ); - var_Destroy( p_libvlc_global, "mosaic-align" ); - var_Destroy( p_libvlc_global, "mosaic-width" ); - var_Destroy( p_libvlc_global, "mosaic-xoffset" ); - var_Destroy( p_libvlc_global, "mosaic-yoffset" ); - var_Destroy( p_libvlc_global, "mosaic-vborder" ); - var_Destroy( p_libvlc_global, "mosaic-hborder" ); - var_Destroy( p_libvlc_global, "mosaic-position" ); - var_Destroy( p_libvlc_global, "mosaic-rows" ); - var_Destroy( p_libvlc_global, "mosaic-cols" ); - var_Destroy( p_libvlc_global, "mosaic-keep-aspect-ratio" ); - - var_Destroy( p_libvlc_global, "mosaic-bsu" ); - var_Destroy( p_libvlc_global, "mosaic-bsv" ); - var_Destroy( p_libvlc_global, "mosaic-bsut" ); - var_Destroy( p_libvlc_global, "mosaic-bsvt" ); - var_Destroy( p_libvlc_global, "mosaic-bs" ); + if( p_sys->i_offsets_length ) + { + free( p_sys->pi_x_offsets ); + free( p_sys->pi_y_offsets ); + p_sys->i_offsets_length = 0; + } + var_Destroy( p_libvlc_global, CFG_PREFIX "offsets" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "alpha" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "height" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "align" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "width" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "xoffset" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "yoffset" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "vborder" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "hborder" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "position" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "rows" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "cols" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "keep-aspect-ratio" ); + + var_Destroy( p_libvlc_global, CFG_PREFIX "bsu" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "bsv" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "bsut" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "bsvt" ); + var_Destroy( p_libvlc_global, CFG_PREFIX "bs" ); if( p_sys->p_pic ) p_sys->p_pic->pf_release( p_sys->p_pic ); vlc_mutex_unlock( &p_sys->lock ); @@ -443,6 +515,17 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) return p_spu; } + if ( p_sys->i_position == 2 ) /* user-defined offsets for positioning */ + { + /* If we have either too much or not enough offsets, fall-back + * to automatic positioning. */ + if ( p_sys->i_offsets_length != p_sys->i_order_length ) + { + msg_Err( p_filter, "Number of specified offsets (%d) does not match number of input substreams in mosaic-order (%d), falling back to mosaic-position=0", p_sys->i_offsets_length, p_sys->i_order_length ); + p_sys->i_position = 0; + } + } + if ( p_sys->i_position == 0 ) /* use automatic positioning */ { int i_numpics = p_sys->i_order_length; /* keep slots and all */ @@ -476,9 +559,9 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) } col_inner_width = ( ( p_sys->i_width - ( p_sys->i_cols - 1 ) - * p_sys->i_vborder ) / p_sys->i_cols ); + * p_sys->i_borderw ) / p_sys->i_cols ); row_inner_height = ( ( p_sys->i_height - ( p_sys->i_rows - 1 ) - * p_sys->i_hborder ) / p_sys->i_rows ); + * p_sys->i_borderh ) / p_sys->i_rows ); i_real_index = 0; @@ -616,7 +699,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) } } /* Gaussian convolution to make it look cleaner */ - memset( p_a, 0, 2 * i_pitch ); + p_filter->p_libvlc->pf_memset( p_a, 0, 2 * i_pitch ); for( i = 2; i < i_lines - 2; i++ ) { p_a[i*i_pitch] = 0x00; @@ -697,39 +780,47 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) p_region->picture.pf_release = MosaicReleasePicture; } - if( fmt_out.i_width > col_inner_width || + if( p_sys->i_position == 2 ) /* user-defined offset */ + { + p_region->i_x = p_sys->pi_x_offsets[i_real_index]; + } + else if( fmt_out.i_width > col_inner_width || p_sys->b_ar || p_sys->b_keep ) { /* we don't have to center the video since it takes the whole rectangle area or it's larger than the rectangle */ p_region->i_x = p_sys->i_xoffset + i_col * ( p_sys->i_width / p_sys->i_cols ) - + ( i_col * p_sys->i_vborder ) / p_sys->i_cols; + + ( i_col * p_sys->i_borderw ) / p_sys->i_cols; } else { /* center the video in the dedicated rectangle */ p_region->i_x = p_sys->i_xoffset + i_col * ( p_sys->i_width / p_sys->i_cols ) - + ( i_col * p_sys->i_vborder ) / p_sys->i_cols + + ( i_col * p_sys->i_borderw ) / p_sys->i_cols + ( col_inner_width - fmt_out.i_width ) / 2; } - if( fmt_out.i_height < row_inner_height + if( p_sys->i_position == 2 ) /* user-defined offset */ + { + p_region->i_y = p_sys->pi_y_offsets[i_real_index]; + } + else if( fmt_out.i_height < row_inner_height || p_sys->b_ar || p_sys->b_keep ) { /* we don't have to center the video since it takes the whole rectangle area or it's taller than the rectangle */ p_region->i_y = p_sys->i_yoffset + i_row * ( p_sys->i_height / p_sys->i_rows ) - + ( i_row * p_sys->i_hborder ) / p_sys->i_rows; + + ( i_row * p_sys->i_borderh ) / p_sys->i_rows; } else { /* center the video in the dedicated rectangle */ p_region->i_y = p_sys->i_yoffset + i_row * ( p_sys->i_height / p_sys->i_rows ) - + ( i_row * p_sys->i_hborder ) / p_sys->i_rows + + ( i_row * p_sys->i_borderh ) / p_sys->i_rows + ( row_inner_height - fmt_out.i_height ) / 2; } @@ -759,7 +850,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, void *p_data ) { filter_sys_t *p_sys = (filter_sys_t *) p_data; - if( !strcmp( psz_var, "mosaic-alpha" ) ) + if( !strcmp( psz_var, CFG_PREFIX "alpha" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing alpha from %d/255 to %d/255", @@ -767,7 +858,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-height" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "height" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing height from %dpx to %dpx", @@ -775,7 +866,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_height = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-width" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "width" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing width from %dpx to %dpx", @@ -783,7 +874,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_width = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-xoffset" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "xoffset" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing x offset from %dpx to %dpx", @@ -791,7 +882,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_xoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-yoffset" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "yoffset" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing y offset from %dpx to %dpx", @@ -799,7 +890,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_yoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-align" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "align" ) ) { int i_old = 0, i_new = 0; vlc_mutex_lock( &p_sys->lock ); @@ -814,23 +905,23 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_align = newval.i_int; vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-vborder" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "borderw" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "changing vertical border from %dpx to %dpx", - p_sys->i_vborder, newval.i_int ); - p_sys->i_vborder = __MAX( newval.i_int, 0 ); + msg_Dbg( p_this, "changing border width from %dpx to %dpx", + p_sys->i_borderw, newval.i_int ); + p_sys->i_borderw = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-hborder" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "borderh" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "changing horizontal border from %dpx to %dpx", - p_sys->i_vborder, newval.i_int ); - p_sys->i_hborder = __MAX( newval.i_int, 0 ); + msg_Dbg( p_this, "changing border height from %dpx to %dpx", + p_sys->i_borderh, newval.i_int ); + p_sys->i_borderh = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-position" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "position" ) ) { if( newval.i_int > 1 || newval.i_int < 0 ) { @@ -846,7 +937,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_mutex_unlock( &p_sys->lock ); } } - else if( !strcmp( psz_var, "mosaic-rows" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "rows" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing number of rows from %d to %d", @@ -854,7 +945,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_rows = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-cols" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "cols" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing number of columns from %d to %d", @@ -862,7 +953,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, p_sys->i_cols = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-order" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "order" ) ) { char *psz_order; int i_index; @@ -899,7 +990,23 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_mutex_unlock( &p_sys->lock ); } - else if( !strcmp( psz_var, "mosaic-keep-aspect-ratio" ) ) + else if( !strcmp( psz_var, CFG_PREFIX "offsets" ) ) + { + vlc_mutex_lock( &p_sys->lock ); + msg_Info( p_this, "Changing mosaic-offsets to %s", newval.psz_string ); + + if( p_sys->i_offsets_length != 0 ) + { + free( p_sys->pi_x_offsets ); + free( p_sys->pi_y_offsets ); + } + p_sys->i_offsets_length = 0; + + mosaic_ParseSetOffsets( (vlc_object_t *) p_this, p_sys, newval.psz_string ); + + vlc_mutex_unlock( &p_sys->lock ); + } + else if( !strcmp( psz_var, CFG_PREFIX "keep-aspect-ratio" ) ) { vlc_mutex_lock( &p_sys->lock ); if( newval.i_int )