#include <math.h>
#include <limits.h> /* INT_MAX */
-#include "vlc_filter.h"
-#include "vlc_image.h"
+#include <vlc_filter.h>
+#include <vlc_image.h>
#include "mosaic.h"
add_integer_with_range( CFG_PREFIX "alpha", 255, 0, 255, NULL,
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 ()
{
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;
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 )
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 );
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" );
{
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;
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
*****************************************************************************/
{
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, (int)newval.i_int);
p_sys->i_alpha = __MIN( __MAX( newval.i_int, 0 ), 255 );
vlc_mutex_unlock( &p_sys->lock );
}
{
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 );
}
{
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 );
}
{
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 );
}
{
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 );
}
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 );
}
{
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 );
}
{
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 );
}
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 );
}
{
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 );
}
{
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 );
}
{
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;