add_string( "crop-geometry", NULL, NULL, GEOMETRY_TEXT,
GEOMETRY_LONGTEXT, false )
- add_bool( "autocrop", 0, NULL, AUTOCROP_TEXT,
+ add_bool( "autocrop", false, NULL, AUTOCROP_TEXT,
AUTOCROP_LONGTEXT, false )
#ifdef BEST_AUTOCROP
*****************************************************************************/
struct vout_sys_t
{
+ vlc_mutex_t lock;
vout_thread_t *p_vout;
unsigned int i_x, i_y;
config_GetInt( p_vout, "autocrop-non-black-pixels" );
p_vout->p_sys->i_diff = config_GetInt( p_vout, "autocrop-diff" );
p_vout->p_sys->i_time = config_GetInt( p_vout, "autocrop-time" );
- vlc_value_t val={0};
- var_Get( p_vout, "ratio-crop", &val );
- val.psz_string = "0";
- var_SetString( p_vout, "ratio-crop", val.psz_string);
+ var_SetString( p_vout, "ratio-crop", "0" );
if (p_vout->p_sys->b_autocrop)
p_vout->p_sys->i_ratio = 0;
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
- dialog_Fatal( p_vout, _("Cropping failed"),
+ dialog_Fatal( p_vout, _("Cropping failed"), "%s",
_("VLC could not open the video output module.") );
return VLC_EGENERIC;
}
+ vlc_mutex_init( &p_vout->p_sys->lock );
#ifdef BEST_AUTOCROP
var_AddCallback( p_vout, "ratio-crop", FilterCallback, NULL );
#endif
}
vout_filter_ReleaseDirectBuffers( p_vout );
+ var_DelCallback( p_vout, "ratio-crop", FilterCallback, NULL );
+ vlc_mutex_destroy( &p_sys->lock );
}
/*****************************************************************************
memset( &fmt, 0, sizeof(video_format_t) );
#ifdef BEST_AUTOCROP
+ /* XXX: not thread-safe with FilterCallback */
msg_Dbg( p_vout, "cropping at %ix%i+%i+%i, %sautocropping",
p_vout->p_sys->i_width, p_vout->p_sys->i_height,
p_vout->p_sys->i_x, p_vout->p_sys->i_y,
if( p_vout->p_sys->p_vout == NULL )
{
msg_Err( p_vout, "failed to create vout" );
- dialog_Fatal( p_vout, _("Cropping failed"),
+ dialog_Fatal( p_vout, _("Cropping failed"), "%s",
_("VLC could not open the video output module.") );
return VLC_EGENERIC;
}
vout_filter_AddChild( p_vout, p_vout->p_sys->p_vout, MouseEvent );
p_vout->p_sys->b_changed = false;
+ vlc_mutex_lock( &p_vout->p_sys->lock );
p_vout->p_sys->i_lastchange = 0;
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
return VLC_SUCCESS;
}
vout_DisplayPicture( p_vout->p_sys->p_vout, p_outpic );
/* The source image may still be in the cache ... parse it! */
+ vlc_mutex_lock( &p_vout->p_sys->lock );
if( p_vout->p_sys->b_autocrop )
- {
UpdateStats( p_vout, p_pic );
- }
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
}
#ifdef BEST_AUTOCROP
if( !strcmp( psz_var, "ratio-crop" ) )
{
+ vlc_mutex_lock( &p_vout->p_sys->lock );
if ( !strcmp( newval.psz_string, "Auto" ) )
p_vout->p_sys->i_ratio = 0;
else
if (p_vout->p_sys->i_ratio < p_vout->output.i_aspect / 432)
p_vout->p_sys->i_ratio = p_vout->output.i_aspect / 432;
}
+ vlc_mutex_unlock( &p_vout->p_sys->lock );
}
return VLC_SUCCESS;
}