X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=c59fb3953cc63bbd23a3d3974760708a7b3e9312;hb=dfcfb98d7878db2649cbd5137325116e6b77f8a0;hp=5ebc83d0b1059df9930a7d6c977c8fb11f3fcf4f;hpb=ce0e4fb0ab2f1d847f4b17ae9a895e01a1ae7224;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index 5ebc83d0b1..c59fb3953c 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -1,48 +1,46 @@ /***************************************************************************** * mosaic.c : Mosaic video plugin for vlc ***************************************************************************** - * Copyright (C) 2004-2007 the VideoLAN team + * Copyright (C) 2004-2008 VLC authors and VideoLAN * $Id$ * - * Authors: Antoine Cellerier + * Authors: Antoine Cellerier * Christophe Massiot * - * 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. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#define _GNU_SOURCE -#include /* malloc(), free() */ -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include -#include +#include +#include -#ifdef HAVE_LIMITS_H -# include /* INT_MAX */ -#endif +#include +#include /* INT_MAX */ -#include "vlc_filter.h" -#include "vlc_image.h" +#include +#include #include "mosaic.h" -#define BLANK_DELAY I64C(1000000) +#define BLANK_DELAY INT64_C(1000000) /***************************************************************************** * Local prototypes @@ -60,13 +58,12 @@ static int MosaicCallback ( vlc_object_t *, char const *, vlc_value_t, 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; int i_position; /* Mosaic positioning method */ - vlc_bool_t b_ar; /* Do we keep the aspect ratio ? */ - vlc_bool_t b_keep; /* Do we keep the original picture format ? */ + bool b_ar; /* Do we keep the aspect ratio ? */ + bool b_keep; /* Do we keep the original picture format ? */ int i_width, i_height; /* Mosaic height and width */ int i_cols, i_rows; /* Mosaic rows and cols */ int i_align; /* Mosaic alignment in background video */ @@ -127,12 +124,12 @@ struct filter_sys_t #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_( \ @@ -164,75 +161,71 @@ enum { position_auto = 0, position_fixed = 1, position_offsets = 2 }; -static int pi_pos_values[] = { 0, 1, 2 }; -static const char *ppsz_pos_descriptions[] = +static const int pi_pos_values[] = { 0, 1, 2 }; +static const char *const ppsz_pos_descriptions[] = { N_("auto"), N_("fixed"), N_("offsets") }; -static int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; -static const char *ppsz_align_descriptions[] = +static const int pi_align_values[] = { 0, 1, 2, 4, 8, 5, 6, 9, 10 }; +static const char *const 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( _("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( 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( 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( 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 ); - - var_Create( p_module->p_libvlc_global, "mosaic-lock", VLC_VAR_MUTEX ); -vlc_module_end(); - -static const char *ppsz_filter_options[] = { +vlc_module_begin () + set_description( N_("Mosaic video sub source") ) + set_shortname( N_("Mosaic") ) + set_category( CAT_VIDEO ) + set_subcategory( SUBCAT_VIDEO_SUBPIC) + set_capability( "sub source", 0 ) + set_callbacks( CreateFilter, DestroyFilter ) + + add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, + ALPHA_TEXT, ALPHA_LONGTEXT, false ) + + add_integer( CFG_PREFIX "height", 100, + HEIGHT_TEXT, HEIGHT_LONGTEXT, false ) + add_integer( CFG_PREFIX "width", 100, + WIDTH_TEXT, WIDTH_LONGTEXT, false ) + + add_integer( CFG_PREFIX "align", 5, + ALIGN_TEXT, ALIGN_LONGTEXT, true) + change_integer_list( pi_align_values, ppsz_align_descriptions ) + + add_integer( CFG_PREFIX "xoffset", 0, + XOFFSET_TEXT, XOFFSET_LONGTEXT, true ) + add_integer( CFG_PREFIX "yoffset", 0, + YOFFSET_TEXT, YOFFSET_LONGTEXT, true ) + + add_integer( CFG_PREFIX "borderw", 0, + BORDERW_TEXT, BORDERW_LONGTEXT, true ) + add_integer( CFG_PREFIX "borderh", 0, + BORDERH_TEXT, BORDERH_LONGTEXT, true ) + + add_integer( CFG_PREFIX "position", 0, + POS_TEXT, POS_LONGTEXT, false ) + 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, + COLS_TEXT, COLS_LONGTEXT, false ) + + add_bool( CFG_PREFIX "keep-aspect-ratio", false, + AR_TEXT, AR_LONGTEXT, false ) + add_bool( CFG_PREFIX "keep-picture", false, + KEEP_TEXT, KEEP_LONGTEXT, false ) + + add_string( CFG_PREFIX "order", "", + ORDER_TEXT, ORDER_LONGTEXT, false ) + + add_string( CFG_PREFIX "offsets", "", + OFFSETS_TEXT, OFFSETS_LONGTEXT, false ) + + add_integer( CFG_PREFIX "delay", 0, DELAY_TEXT, DELAY_LONGTEXT, + false ) +vlc_module_end () + +static const char *const ppsz_filter_options[] = { "alpha", "height", "width", "align", "xoffset", "yoffset", "borderw", "borderh", "position", "rows", "cols", "keep-aspect-ratio", "keep-picture", "order", "offsets", @@ -244,9 +237,7 @@ static const char *ppsz_filter_options[] = { * 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 ) { @@ -258,14 +249,14 @@ static void __mosaic_ParseSetOffsets( vlc_object_t *p_this, { i_index++; - p_sys->pi_x_offsets = - realloc( p_sys->pi_x_offsets, i_index * sizeof(int) ); + p_sys->pi_x_offsets = xrealloc( 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 = xrealloc( 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; @@ -278,6 +269,8 @@ static void __mosaic_ParseSetOffsets( vlc_object_t *p_this, 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 @@ -286,37 +279,27 @@ static int CreateFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_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_order, *_psz_order; char *psz_offsets; int i_index; - vlc_value_t val; - - /* The mosaic thread is more important than the decoder threads */ - vlc_thread_set_priority( p_this, VLC_THREAD_PRIORITY_OUTPUT ); + int i_command; /* Allocate structure */ p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) ); if( p_sys == NULL ) - { - msg_Err( p_filter, "out of memory" ); return VLC_ENOMEM; - } - p_filter->pf_sub_filter = Filter; + p_filter->pf_sub_source = Filter; - vlc_mutex_init( p_filter, &p_sys->lock ); + vlc_mutex_init( &p_sys->lock ); vlc_mutex_lock( &p_sys->lock ); - 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_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ) ) ); \ + i_command = var_CreateGetIntegerCommand( p_filter, CFG_PREFIX #name ); \ + 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 ); @@ -335,6 +318,7 @@ static int CreateFilter( vlc_object_t *p_this ) GET_VAR( alpha, 0, 255 ); GET_VAR( position, 0, 2 ); GET_VAR( delay, 100, INT_MAX ); +#undef GET_VAR p_sys->i_delay *= 1000; p_sys->b_ar = var_CreateGetBoolCommand( p_filter, @@ -352,6 +336,7 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_order_length = 0; p_sys->ppsz_order = NULL; psz_order = var_CreateGetStringCommand( p_filter, CFG_PREFIX "order" ); + _psz_order = psz_order; var_AddCallback( p_filter, CFG_PREFIX "order", MosaicCallback, p_sys ); if( *psz_order ) @@ -362,8 +347,8 @@ static int CreateFilter( vlc_object_t *p_this ) { psz_end = strchr( psz_order, ',' ); i_index++; - p_sys->ppsz_order = realloc( p_sys->ppsz_order, - i_index * sizeof(char *) ); + p_sys->ppsz_order = xrealloc( 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; @@ -371,12 +356,15 @@ static int CreateFilter( vlc_object_t *p_this ) p_sys->i_order_length = i_index; } + free( _psz_order ); + /* Manage specific offsets for substreams */ psz_offsets = var_CreateGetStringCommand( 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( p_filter, p_sys, psz_offsets ); + free( psz_offsets ); var_AddCallback( p_filter, CFG_PREFIX "offsets", MosaicCallback, p_sys ); vlc_mutex_unlock( &p_sys->lock ); @@ -391,10 +379,27 @@ static void DestroyFilter( vlc_object_t *p_this ) { filter_t *p_filter = (filter_t*)p_this; filter_sys_t *p_sys = p_filter->p_sys; - libvlc_global_data_t *p_libvlc_global = p_filter->p_libvlc_global; - int i_index; - vlc_mutex_lock( &p_sys->lock ); +#define DEL_CB( name ) \ + var_DelCallback( p_filter, CFG_PREFIX #name, MosaicCallback, p_sys ) + DEL_CB( width ); + DEL_CB( height ); + DEL_CB( xoffset ); + DEL_CB( yoffset ); + + DEL_CB( align ); + + DEL_CB( borderw ); + DEL_CB( borderh ); + DEL_CB( rows ); + DEL_CB( cols ); + DEL_CB( alpha ); + DEL_CB( position ); + DEL_CB( delay ); + + DEL_CB( keep-aspect-ratio ); + DEL_CB( order ); +#undef DEL_CB if( !p_sys->b_keep ) { @@ -403,7 +408,7 @@ static void DestroyFilter( vlc_object_t *p_this ) if( p_sys->i_order_length ) { - for( i_index = 0; i_index < p_sys->i_order_length; i_index++ ) + for( int i_index = 0; i_index < p_sys->i_order_length; i_index++ ) { free( p_sys->ppsz_order[i_index] ); } @@ -416,21 +421,10 @@ static void DestroyFilter( vlc_object_t *p_this ) p_sys->i_offsets_length = 0; } - vlc_mutex_unlock( &p_sys->lock ); vlc_mutex_destroy( &p_sys->lock ); free( p_sys ); } -/***************************************************************************** - * MosaicReleasePicture : Hack to avoid picture duplication - *****************************************************************************/ -static void MosaicReleasePicture( picture_t *p_picture ) -{ - picture_t *p_original_pic = (picture_t *)p_picture->p_sys; - - p_original_pic->pf_release( p_original_pic ); -} - /***************************************************************************** * Filter *****************************************************************************/ @@ -450,28 +444,25 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) subpicture_region_t *p_region_prev = NULL; /* Allocate the subpicture internal data. */ - p_spu = p_filter->pf_sub_buffer_new( p_filter ); + p_spu = filter_NewSubpicture( p_filter ); if( !p_spu ) - { return NULL; - } /* Initialize subpicture */ p_spu->i_channel = 0; p_spu->i_start = date; p_spu->i_stop = 0; - p_spu->b_ephemer = VLC_TRUE; + p_spu->b_ephemer = true; p_spu->i_alpha = p_sys->i_alpha; - p_spu->i_flags = p_sys->i_align; - p_spu->b_absolute = VLC_FALSE; + 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; } @@ -500,7 +491,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) if ( !p_es->b_empty ) { i_numpics ++; - if( p_sys->i_order_length && p_es->psz_id != 0 ) + if( p_sys->i_order_length && p_es->psz_id != NULL ) { /* We also want to leave slots for images given in * mosaic-order that are not available in p_vout_picture */ @@ -548,21 +539,21 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) if ( p_es->p_picture->p_next != NULL ) { picture_t *p_next = p_es->p_picture->p_next; - p_es->p_picture->pf_release( p_es->p_picture ); + picture_Release( p_es->p_picture ); p_es->p_picture = p_next; } else if ( p_es->p_picture->date + p_sys->i_delay + BLANK_DELAY < date ) { /* Display blank */ - p_es->p_picture->pf_release( p_es->p_picture ); + picture_Release( p_es->p_picture ); p_es->p_picture = NULL; p_es->pp_last = &p_es->p_picture; break; } else { - msg_Dbg( p_filter, "too late picture for %s (" I64Fd ")", + msg_Dbg( p_filter, "too late picture for %s (%"PRId64 ")", p_es->psz_id, date - p_es->p_picture->date - p_sys->i_delay ); break; @@ -601,7 +592,11 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt_in.i_height = p_es->p_picture->format.i_height; fmt_in.i_width = p_es->p_picture->format.i_width; - fmt_out.i_chroma = VLC_FOURCC('I','4','2','0'); + if( fmt_in.i_chroma == VLC_CODEC_YUVA || + fmt_in.i_chroma == VLC_CODEC_RGBA ) + fmt_out.i_chroma = VLC_CODEC_YUVA; + else + fmt_out.i_chroma = VLC_CODEC_I420; fmt_out.i_width = col_inner_width; fmt_out.i_height = row_inner_height; @@ -635,7 +630,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) else { p_converted = p_es->p_picture; - p_converted->i_refcount++; fmt_in.i_width = fmt_out.i_width = p_converted->format.i_width; fmt_in.i_height = fmt_out.i_height = p_converted->format.i_height; fmt_in.i_chroma = fmt_out.i_chroma = p_converted->format.i_chroma; @@ -643,74 +637,72 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) fmt_out.i_visible_height = fmt_out.i_height; } - p_region = p_spu->pf_make_region( VLC_OBJECT(p_filter), &fmt_out, - p_converted ); + p_region = subpicture_region_New( &fmt_out ); + /* FIXME the copy is probably not needed anymore */ + if( p_region ) + picture_Copy( p_region->p_picture, p_converted ); + if( !p_sys->b_keep ) + picture_Release( p_converted ); + if( !p_region ) { msg_Err( p_filter, "cannot allocate SPU region" ); p_filter->pf_sub_buffer_del( p_filter, p_spu ); + vlc_global_unlock( VLC_MOSAIC_MUTEX ); vlc_mutex_unlock( &p_sys->lock ); - vlc_mutex_unlock( p_sys->p_lock ); return p_spu; } - /* HACK ALERT: let's fix the pointers to avoid picture duplication. - * This is necessary because p_region->picture is not a pointer - * as it ought to be. */ - if( !p_sys->b_keep ) + if( p_es->i_x >= 0 && p_es->i_y >= 0 ) { - free( p_converted ); + p_region->i_x = p_es->i_x; + p_region->i_y = p_es->i_y; } - else - { - /* Keep a pointer to the original picture (and its refcount...). */ - p_region->picture.p_sys = (picture_sys_t *)p_converted; - p_region->picture.pf_release = MosaicReleasePicture; - } - - if( p_sys->i_position == position_offsets ) + else if( p_sys->i_position == position_offsets ) { 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_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_borderw ) / p_sys->i_cols - + ( col_inner_width - fmt_out.i_width ) / 2; - } - - if( p_sys->i_position == position_offsets ) - { 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_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_borderh ) / p_sys->i_rows - + ( row_inner_height - fmt_out.i_height ) / 2; + 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_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_borderw ) / 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_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_borderh ) / p_sys->i_rows + + ( row_inner_height - fmt_out.i_height ) / 2; + } } + p_region->i_align = p_sys->i_align; + p_region->i_alpha = p_es->i_alpha; if( p_region_prev == NULL ) { @@ -724,7 +716,7 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) 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; @@ -737,6 +729,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_value_t oldval, vlc_value_t newval, void *p_data ) { + VLC_UNUSED(oldval); filter_sys_t *p_sys = (filter_sys_t *) p_data; #define VAR_IS( a ) !strcmp( psz_var, CFG_PREFIX a ) @@ -744,15 +737,15 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); 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 ); + p_sys->i_alpha, (int)newval.i_int); + p_sys->i_alpha = VLC_CLIP( newval.i_int, 0, 255 ); vlc_mutex_unlock( &p_sys->lock ); } else if( VAR_IS( "height" ) ) { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing height from %dpx to %dpx", - p_sys->i_height, newval.i_int ); + p_sys->i_height, (int)newval.i_int ); p_sys->i_height = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -760,7 +753,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing width from %dpx to %dpx", - p_sys->i_width, newval.i_int ); + p_sys->i_width, (int)newval.i_int ); p_sys->i_width = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -768,7 +761,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing x offset from %dpx to %dpx", - p_sys->i_xoffset, newval.i_int ); + p_sys->i_xoffset, (int)newval.i_int ); p_sys->i_xoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -776,7 +769,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing y offset from %dpx to %dpx", - p_sys->i_yoffset, newval.i_int ); + p_sys->i_yoffset, (int)newval.i_int ); p_sys->i_yoffset = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -784,14 +777,14 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { 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++; while( pi_align_values[i_new] != newval.i_int ) i_new++; 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] ); + (int)newval.i_int, ppsz_align_descriptions[i_new] ); p_sys->i_align = newval.i_int; vlc_mutex_unlock( &p_sys->lock ); } @@ -799,7 +792,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing border width from %dpx to %dpx", - p_sys->i_borderw, newval.i_int ); + p_sys->i_borderw, (int)newval.i_int ); p_sys->i_borderw = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -807,7 +800,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing border height from %dpx to %dpx", - p_sys->i_borderh, newval.i_int ); + p_sys->i_borderh, (int)newval.i_int ); p_sys->i_borderh = __MAX( newval.i_int, 0 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -826,7 +819,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, vlc_mutex_lock( &p_sys->lock ); 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]); + (int)newval.i_int, ppsz_pos_descriptions[newval.i_int]); p_sys->i_position = newval.i_int; vlc_mutex_unlock( &p_sys->lock ); } @@ -835,7 +828,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing number of rows from %d to %d", - p_sys->i_rows, newval.i_int ); + p_sys->i_rows, (int)newval.i_int ); p_sys->i_rows = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -843,7 +836,7 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { vlc_mutex_lock( &p_sys->lock ); msg_Dbg( p_this, "changing number of columns from %d to %d", - p_sys->i_cols, newval.i_int ); + p_sys->i_cols, (int)newval.i_int ); p_sys->i_cols = __MAX( newval.i_int, 1 ); vlc_mutex_unlock( &p_sys->lock ); } @@ -871,8 +864,8 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, { psz_end = strchr( psz_order, ',' ); i_index++; - p_sys->ppsz_order = realloc( p_sys->ppsz_order, - i_index * sizeof(char *) ); + p_sys->ppsz_order = xrealloc( 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; @@ -889,10 +882,12 @@ static int MosaicCallback( vlc_object_t *p_this, char const *psz_var, if( p_sys->i_offsets_length != 0 ) { + p_sys->i_offsets_length = 0; free( p_sys->pi_x_offsets ); free( p_sys->pi_y_offsets ); + p_sys->pi_x_offsets = NULL; + p_sys->pi_y_offsets = NULL; } - p_sys->i_offsets_length = 0; mosaic_ParseSetOffsets( p_this, p_sys, newval.psz_string );