X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fvideo_filter%2Fmosaic.c;h=63d74a759574eb4cc6a4d067b36170721c549ce5;hb=e5d6c04c14ccbd152458f6611e176dbb3945a956;hp=d9488f9807ce4c16e09f9e681151a57793fcc3bf;hpb=78d87996ccb92d1dc91c9987685f976ed3be08a6;p=vlc diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index d9488f9807..63d74a7595 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -1,25 +1,25 @@ /***************************************************************************** * 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 * 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. *****************************************************************************/ /***************************************************************************** @@ -35,8 +35,8 @@ #include #include /* INT_MAX */ -#include "vlc_filter.h" -#include "vlc_image.h" +#include +#include #include "mosaic.h" @@ -58,7 +58,6 @@ 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; @@ -125,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_( \ @@ -174,57 +173,55 @@ static const char *const ppsz_align_descriptions[] = #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", 0, NULL, + add_bool( CFG_PREFIX "keep-aspect-ratio", false, AR_TEXT, AR_LONGTEXT, false ) - add_bool( CFG_PREFIX "keep-picture", 0, 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 () @@ -240,9 +237,7 @@ static const char *const 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 ) { @@ -254,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; @@ -274,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 @@ -282,36 +279,27 @@ static int CreateFilter( vlc_object_t *p_this ) { 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 ); @@ -321,7 +309,7 @@ static int CreateFilter( vlc_object_t *p_this ) GET_VAR( align, 0, 10 ); if( p_sys->i_align == 3 || p_sys->i_align == 7 ) - p_sys->i_align = 5; /* FIXME: NOT THREAD SAFE w.r.t. callback */ + p_sys->i_align = 5; GET_VAR( borderw, 0, INT_MAX ); GET_VAR( borderh, 0, INT_MAX ); @@ -331,7 +319,7 @@ static int CreateFilter( vlc_object_t *p_this ) GET_VAR( position, 0, 2 ); GET_VAR( delay, 100, INT_MAX ); #undef GET_VAR - p_sys->i_delay *= 1000; /* FIXME: NOT THREAD SAFE w.r.t. callback */ + p_sys->i_delay *= 1000; p_sys->b_ar = var_CreateGetBoolCommand( p_filter, CFG_PREFIX "keep-aspect-ratio" ); @@ -359,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; @@ -392,7 +380,26 @@ 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; - /* FIXME: destroy callbacks first! */ +#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 ) { @@ -418,16 +425,6 @@ static void DestroyFilter( vlc_object_t *p_this ) 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; - - picture_Release( p_original_pic ); -} - /***************************************************************************** * Filter *****************************************************************************/ @@ -436,8 +433,6 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) 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; @@ -447,7 +442,7 @@ 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 = filter_NewSubpicture( p_filter ); + subpicture_t *p_spu = filter_NewSubpicture( p_filter ); if( !p_spu ) return NULL; @@ -459,13 +454,16 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) 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; } @@ -650,10 +648,10 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) if( !p_region ) { msg_Err( p_filter, "cannot allocate SPU region" ); - p_filter->pf_sub_buffer_del( p_filter, p_spu ); + subpicture_Delete( p_spu ); + vlc_global_unlock( VLC_MOSAIC_MUTEX ); vlc_mutex_unlock( &p_sys->lock ); - vlc_mutex_unlock( p_sys->p_lock ); - return p_spu; + return NULL; } if( p_es->i_x >= 0 && p_es->i_y >= 0 ) @@ -719,7 +717,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; @@ -740,15 +738,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 ); } @@ -756,7 +754,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 ); } @@ -764,7 +762,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 ); } @@ -772,7 +770,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 ); } @@ -780,14 +778,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 ); } @@ -795,7 +793,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 ); } @@ -803,7 +801,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 ); } @@ -822,7 +820,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 ); } @@ -831,7 +829,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 ); } @@ -839,7 +837,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 ); } @@ -867,8 +865,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;