X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=55cd135c1edb8d03b7b46ede8b7ddbf56bab32d7;hb=47643f0a85bf67e29d9d1fa23a05b20aac26a685;hp=19d6111acd2f7abc8aaa094444a7b825483c1e45;hpb=517a49ffa083d3ea076836bec3c58d4744f096a1;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 19d6111acd..55cd135c1e 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -87,38 +87,81 @@ struct filter_sys_t /***************************************************************************** * Module descriptor *****************************************************************************/ -#define ALPHA_TEXT N_("Alpha blending") -#define ALPHA_LONGTEXT N_("Alpha blending (0 -> 255). Default is 255") - -#define HEIGHT_TEXT N_("Height in pixels") -#define WIDTH_TEXT N_("Width in pixels") -#define XOFFSET_TEXT N_("Top left corner x coordinate") -#define YOFFSET_TEXT N_("Top left corner y coordinate") -#define VBORDER_TEXT N_("Vertical border width in pixels") -#define HBORDER_TEXT N_("Horizontal border width in pixels") -#define ALIGN_TEXT N_("Mosaic alignment") +#define ALPHA_TEXT N_("Transparency") +#define ALPHA_LONGTEXT N_("Transparency of the mosaic foreground pictures. " \ + "0 means transparent, 255 opaque (default)." ) + +#define HEIGHT_TEXT N_("Height") +#define HEIGHT_LONGTEXT N_( "Total height of the mosaic, in pixels." ) +#define WIDTH_TEXT N_("Width") +#define WIDTH_LONGTEXT N_( "Total width of the mosaic, in pixels." ) + +#define XOFFSET_TEXT N_("Top left corner X coordinate") +#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 ALIGN_TEXT N_("Mosaic alignment" ) +#define ALIGN_LONGTEXT N_( \ + "You can enforce the mosaic alignment on the video " \ + "(0=center, 1=left, 2=right, 4=top, 8=bottom, you can " \ + "also use combinations of these values, eg 6 = top-right).") #define POS_TEXT N_("Positioning method") -#define POS_LONGTEXT N_("Positioning method. auto: automatically choose " \ - "the best number of rows and columns. fixed: use the user-defined " \ - "number of rows and columns.") +#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.") + +/// \bug [String] missing closing parenthesis #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\"." ) #define COLS_TEXT N_("Number of columns") -#define AR_TEXT N_("Keep aspect ratio when resizing") +#define COLS_LONGTEXT N_("Number of image columns in the mosaic (only used if "\ + "positionning method is set to \"fixed\"." ) + +#define AR_TEXT N_("Keep aspect ratio") +#define AR_LONGTEXT N_("Keep the original aspect ratio when resizing " \ + "mosaic elements." ) #define KEEP_TEXT N_("Keep original size") +#define KEEP_LONGTEXT N_("Keep the original size of mosaic elements." ) -#define ORDER_TEXT N_("Order as a comma separated list of picture-id(s)") +#define ORDER_TEXT N_("Elements order" ) +#define ORDER_LONGTEXT N_( "You can enforce the order of the elements on " \ + "the mosaic. You must give a comma-separated list of picture ID(s)." \ + "These IDs are assigned in the \"mosaic-bridge\" module." ) #define DELAY_TEXT N_("Delay") -#define DELAY_LONGTEXT N_("Pictures coming from the picture video outputs " \ - "will be delayed accordingly (in milliseconds). For high " \ - "values you will need to raise file-caching and others.") - -#define BLUESCREEN_TEXT N_("Enable bluescreen (aka greenscreen or chroma key) video background replacing") -#define BLUESCREENU_TEXT N_("Bluescreen chroma key U (0-255)") -#define BLUESCREENV_TEXT N_("Bluescreen chroma key V (0-255)") -#define BLUESCREENUTOL_TEXT N_("Bluescreen chroma key U tolerance") -#define BLUESCREENVTOL_TEXT N_("Bluescreen chroma key V tolerance") +#define DELAY_LONGTEXT N_("Pictures coming from the mosaic elements " \ + "will be delayed according to this value (in milliseconds). For high " \ + "values you will need to raise caching at input.") + +#define BLUESCREEN_TEXT N_("Bluescreen" ) +#define BLUESCREEN_LONGTEXT N_( "This effect, also known as \"greenscreen\" "\ + "or \"chroma key\" blends the \"blue parts\" of the foreground images of " \ + "the mosaic on the background (like wheather forecast presenters). You " \ + "can choose the \"key\" color for blending (blue by default)." ) + +#define BLUESCREENU_TEXT N_("Bluescreen U value") +#define BLUESCREENU_LONGTEXT N_("\"U\" value for the bluescreen key color " \ + "(in YUV values). From 0 to 255. Defaults to 120 for blue." ) +#define BLUESCREENV_TEXT N_("Bluescreen V value") +#define BLUESCREENV_LONGTEXT N_("\"V\" value for the bluescreen key color " \ + "(in YUV values). From 0 to 255. Defaults to 90 for blue." ) +#define BLUESCREENUTOL_TEXT N_("Bluescreen U tolerance") +#define BLUESCREENUTOL_LONGTEXT N_("Tolerance of the bluescreen blender " \ + "on color variations for the U plane. A value between 10 and 20 " \ + "seems sensible." ) +#define BLUESCREENVTOL_TEXT N_("Bluescreen V tolerance") +#define BLUESCREENVTOL_LONGTEXT N_("Tolerance of the bluescreen blender " \ + "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[] = @@ -139,36 +182,36 @@ vlc_module_begin(); 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_TEXT, VLC_FALSE ); - add_integer( "mosaic-width", 100, NULL, WIDTH_TEXT, WIDTH_TEXT, VLC_FALSE ); - add_integer( "mosaic-align", 5, NULL, ALIGN_TEXT, ALIGN_TEXT, VLC_TRUE); + 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); change_integer_list( pi_align_values, ppsz_align_descriptions, 0 ); - add_integer( "mosaic-xoffset", 0, NULL, XOFFSET_TEXT, XOFFSET_TEXT, VLC_TRUE ); - add_integer( "mosaic-yoffset", 0, NULL, YOFFSET_TEXT, YOFFSET_TEXT, VLC_TRUE ); - add_integer( "mosaic-vborder", 0, NULL, VBORDER_TEXT, VBORDER_TEXT, VLC_TRUE ); - add_integer( "mosaic-hborder", 0, NULL, HBORDER_TEXT, HBORDER_TEXT, VLC_TRUE ); + 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 ); change_integer_list( pi_pos_values, ppsz_pos_descriptions, 0 ); - add_integer( "mosaic-rows", 2, NULL, ROWS_TEXT, ROWS_TEXT, VLC_FALSE ); - add_integer( "mosaic-cols", 2, NULL, COLS_TEXT, COLS_TEXT, VLC_FALSE ); - add_bool( "mosaic-keep-aspect-ratio", 0, NULL, AR_TEXT, AR_TEXT, VLC_FALSE ); - add_bool( "mosaic-keep-picture", 0, NULL, KEEP_TEXT, KEEP_TEXT, VLC_FALSE ); - add_string( "mosaic-order", "", NULL, ORDER_TEXT, ORDER_TEXT, VLC_FALSE ); + 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, VLC_FALSE ); add_bool( "mosaic-bs", 0, NULL, BLUESCREEN_TEXT, - BLUESCREEN_TEXT, VLC_FALSE ); + BLUESCREEN_LONGTEXT, VLC_FALSE ); add_integer( "mosaic-bsu", 120, NULL, BLUESCREENU_TEXT, - BLUESCREENU_TEXT, VLC_FALSE ); + BLUESCREENU_LONGTEXT, VLC_FALSE ); add_integer( "mosaic-bsv", 90, NULL, BLUESCREENV_TEXT, - BLUESCREENV_TEXT, VLC_FALSE ); + BLUESCREENV_LONGTEXT, VLC_FALSE ); add_integer( "mosaic-bsut", 17, NULL, BLUESCREENUTOL_TEXT, - BLUESCREENUTOL_TEXT, VLC_FALSE ); + BLUESCREENUTOL_LONGTEXT, VLC_FALSE ); add_integer( "mosaic-bsvt", 17, NULL, BLUESCREENVTOL_TEXT, - BLUESCREENVTOL_TEXT, VLC_FALSE ); + BLUESCREENVTOL_LONGTEXT, VLC_FALSE ); var_Create( p_module->p_libvlc, "mosaic-lock", VLC_VAR_MUTEX ); vlc_module_end(); @@ -253,6 +296,9 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->ppsz_order = NULL; psz_order = var_CreateGetString( p_filter, "mosaic-order" ); + var_Create( p_libvlc, "mosaic-order", VLC_VAR_STRING); + var_AddCallback( p_libvlc, "mosaic-order", MosaicCallback, p_sys ); + if( psz_order[0] != 0 ) { char *psz_end = NULL; @@ -365,6 +411,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) int i_index, i_real_index, i_row, i_col; int i_greatest_real_index_used = p_sys->i_order_length - 1; + unsigned int col_inner_width, row_inner_height; + subpicture_region_t *p_region; subpicture_region_t *p_region_prev = NULL; @@ -427,6 +475,11 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) i_numpics / p_sys->i_rows + 1 ); } + col_inner_width = ( ( p_sys->i_width - ( p_sys->i_cols - 1 ) + * p_sys->i_vborder ) / p_sys->i_cols ); + row_inner_height = ( ( p_sys->i_height - ( p_sys->i_rows - 1 ) + * p_sys->i_hborder ) / p_sys->i_rows ); + i_real_index = 0; for ( i_index = 0; i_index < p_bridge->i_es_num; i_index++ ) @@ -498,12 +551,9 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt_in.i_width = p_es->p_picture->format.i_width; fmt_out.i_chroma = VLC_FOURCC('Y','U','V','A'); - fmt_out.i_width = fmt_in.i_width * - ( ( p_sys->i_width - ( p_sys->i_cols - 1 ) * p_sys->i_vborder ) - / p_sys->i_cols ) / fmt_in.i_width; - fmt_out.i_height = fmt_in.i_height * - ( ( p_sys->i_height - ( p_sys->i_rows - 1 ) * p_sys->i_hborder ) - / p_sys->i_rows ) / fmt_in.i_height; + fmt_out.i_width = col_inner_width; + fmt_out.i_height = row_inner_height; + if( p_sys->b_ar ) /* keep aspect ratio */ { if( (float)fmt_out.i_width / (float)fmt_out.i_height @@ -647,32 +697,40 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) p_region->picture.pf_release = MosaicReleasePicture; } - if( p_sys->b_ar || p_sys->b_keep ) /* keep aspect ratio */ + if( fmt_out.i_width > col_inner_width || + p_sys->b_ar || p_sys->b_keep ) { - /* center the video in the dedicated rectangle */ + /* 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 - + ( ( ( p_sys->i_width - - ( p_sys->i_cols - 1 ) * p_sys->i_vborder ) - / p_sys->i_cols ) - fmt_out.i_width ) / 2; - 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 - + ( ( ( p_sys->i_height - - ( p_sys->i_rows - 1 ) * p_sys->i_hborder ) - / p_sys->i_rows ) - fmt_out.i_height ) / 2; + + ( i_col * p_sys->i_vborder ) / p_sys->i_cols; } else { - /* we don't have to center the video since it takes the - whole rectangle area */ + /* 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_width / p_sys->i_cols ) + + ( i_col * p_sys->i_vborder ) / p_sys->i_cols + + ( col_inner_width - fmt_out.i_width ) / 2; + } + + 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_height / p_sys->i_rows ) + + ( i_row * p_sys->i_hborder ) / 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 + + ( row_inner_height - fmt_out.i_height ) / 2; } if( p_region_prev == NULL ) @@ -704,7 +762,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, if( !strcmp( psz_var, "mosaic-alpha" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing alpha from %d/255 to %d/255", + msg_Dbg( p_this, "changing alpha from %d/255 to %d/255", p_sys->i_alpha, newval.i_int); p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 ); vlc_mutex_unlock( &p_sys->lock ); @@ -712,7 +770,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-height" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing height from %dpx to %dpx", + msg_Dbg( p_this, "changing height from %dpx to %dpx", p_sys->i_height, newval.i_int ); p_sys->i_height = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -720,7 +778,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-width" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing width from %dpx to %dpx", + msg_Dbg( p_this, "changing width from %dpx to %dpx", p_sys->i_width, newval.i_int ); p_sys->i_width = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -728,7 +786,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-xoffset" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing x offset from %dpx to %dpx", + msg_Dbg( p_this, "changing x offset from %dpx to %dpx", p_sys->i_xoffset, newval.i_int ); p_sys->i_xoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -736,7 +794,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-yoffset" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing y offset from %dpx to %dpx", + msg_Dbg( p_this, "changing y offset from %dpx to %dpx", p_sys->i_yoffset, newval.i_int ); p_sys->i_yoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); @@ -750,7 +808,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, newval.i_int = 5; while( pi_align_values[i_old] != p_sys->i_align ) i_old++; while( pi_align_values[i_new] != newval.i_int ) i_new++; - msg_Dbg( p_this, "Changing alignment from %d (%s) to %d (%s)", + msg_Dbg( p_this, "changing alignment from %d (%s) to %d (%s)", p_sys->i_align, ppsz_align_descriptions[i_old], newval.i_int, ppsz_align_descriptions[i_new] ); p_sys->i_align = newval.i_int; @@ -759,7 +817,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-vborder" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing vertical border from %dpx to %dpx", + 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 ); vlc_mutex_unlock( &p_sys->lock ); @@ -767,7 +825,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-hborder" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing horizontal border from %dpx to %dpx", + 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 ); vlc_mutex_unlock( &p_sys->lock ); @@ -781,7 +839,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing position method from %d (%s) to %d (%s)", + msg_Dbg( p_this, "changing position method from %d (%s) to %d (%s)", p_sys->i_position, ppsz_pos_descriptions[p_sys->i_position], newval.i_int, ppsz_pos_descriptions[newval.i_int]); p_sys->i_position = newval.i_int; @@ -791,7 +849,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-rows" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing number of rows from %d to %d", + msg_Dbg( p_this, "changing number of rows from %d to %d", p_sys->i_rows, newval.i_int ); p_sys->i_rows = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); @@ -799,22 +857,57 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, else if( !strcmp( psz_var, "mosaic-cols" ) ) { vlc_mutex_lock( &p_sys->lock ); - msg_Dbg( p_this, "Changing number of columns from %d to %d", + msg_Dbg( p_this, "changing number of columns from %d to %d", p_sys->i_cols, newval.i_int ); p_sys->i_cols = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } + else if( !strcmp( psz_var, "mosaic-order" ) ) + { + char *psz_order; + int i_index; + vlc_mutex_lock( &p_sys->lock ); + msg_Dbg( p_this, "Changing mosaic order to %s", newval.psz_string ); + + p_sys->i_order_length = 0; + p_sys->ppsz_order = NULL; + psz_order = newval.psz_string; + + while( p_sys->i_order_length-- ) + { + printf("%d\n", p_sys->ppsz_order); + free( p_sys->ppsz_order ); + } + if( psz_order[0] != 0 ) + { + char *psz_end = NULL; + i_index = 0; + do + { + psz_end = strchr( psz_order, ',' ); + i_index++; + p_sys->ppsz_order = realloc( p_sys->ppsz_order, + i_index * sizeof(char *) ); + p_sys->ppsz_order[i_index - 1] = strndup( psz_order, + psz_end - psz_order ); + psz_order = psz_end+1; + } while( NULL != psz_end ); + p_sys->i_order_length = i_index; + } + + vlc_mutex_unlock( &p_sys->lock ); + } else if( !strcmp( psz_var, "mosaic-keep-aspect-ratio" ) ) { vlc_mutex_lock( &p_sys->lock ); if( newval.i_int ) { - msg_Dbg( p_this, "Keep aspect ratio" ); + msg_Dbg( p_this, "keeping aspect ratio" ); p_sys->b_ar = 1; } else { - msg_Dbg( p_this, "Don't keep aspect ratio" ); + msg_Dbg( p_this, "won't keep aspect ratio" ); p_sys->b_ar = 0; } vlc_mutex_unlock( &p_sys->lock );