vlc_module_begin();
set_description( N_("QuickTime library decoder") );
- set_capability( "decoder", 10 );
+ set_capability( "decoder", 0 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_VCODEC );
set_callbacks( Open, Close );
int i_out;
};
-static int pi_channels_maps[6] =
+static const int pi_channels_maps[6] =
{
0,
AOUT_CHAN_CENTER,
}
}
+static vlc_mutex_t qt_mutex = VLC_STATIC_MUTEX;
+
/*****************************************************************************
* Close:
*****************************************************************************/
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- vlc_mutex_t *lock;
/* get lock, avoid segfault */
- lock = var_AcquireMutex( "qt_mutex" );
+ vlc_mutex_lock( &qt_mutex );
if( p_dec->fmt_out.i_cat == AUDIO_ES )
{
#endif
#endif
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
free( p_sys );
}
unsigned long OutputBufferSize = 0;
/* get lock, avoid segfault */
- vlc_mutex_t *lock = var_AcquireMutex( "qt_mutex" );
- if( lock == NULL )
- return VLC_EGENERIC;
+ vlc_mutex_lock( &qt_mutex );
p_sys = calloc( sizeof( decoder_sys_t ), 1 );
p_dec->p_sys = p_sys;
p_sys->i_out = 0;
p_sys->i_out_frames = 0;
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
return VLC_SUCCESS;
exit_error:
#ifdef LOADER
Restore_LDT_Keeper( p_sys->ldt_fs );
#endif
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
free( p_sys );
return VLC_EGENERIC;
{
int i_frames = p_sys->i_buffer / p_sys->InFrameSize;
unsigned long i_out_frames, i_out_bytes;
- vlc_mutex_t *lock = var_AcquireMutex( "qt_mutex ");
+ vlc_mutex_lock( &qt_mutex );
i_error = p_sys->SoundConverterConvertBuffer( p_sys->myConverter,
p_sys->p_buffer,
p_sys->out_buffer,
&i_out_frames,
&i_out_bytes );
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
/*
msg_Dbg( p_dec, "decoded %d frames -> %ld frames (error=%d)",
return VLC_ENOMEM;
#ifndef WIN32
- vlc_mutex_t *lock;
long i_result;
ComponentDescription desc;
Component prev;
fcc, p_dec->fmt_in.video.i_width, p_dec->fmt_in.video.i_height );
/* get lock, avoid segfault */
- lock = var_AcquireMutex( "qt_mutex" );
+ vlc_mutex_lock( &qt_mutex );
#ifdef __APPLE__
EnterMovies();
p_sys->framedescHandle = (ImageDescriptionHandle) NewHandleClear( id->idSize );
memcpy( *p_sys->framedescHandle, id, id->idSize );
- p_sys->plane = malloc( p_dec->fmt_in.video.i_width * p_dec->fmt_in.video.i_height * 3 );
+ if( p_dec->fmt_in.video.i_width != 0 && p_dec->fmt_in.video.i_height != 0)
+ p_sys->plane = malloc( p_dec->fmt_in.video.i_width * p_dec->fmt_in.video.i_height * 3 );
if( !p_sys->plane )
goto exit_error;
p_dec->fmt_out.video.i_height= p_dec->fmt_in.video.i_height;
p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * p_dec->fmt_in.video.i_width / p_dec->fmt_in.video.i_height;
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
return VLC_SUCCESS;
exit_error:
#ifdef LOADER
Restore_LDT_Keeper( p_sys->ldt_fs );
#endif
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
#endif /* !WIN32 */
static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- vlc_mutex_t *lock;
block_t *p_block;
picture_t *p_pic;
mtime_t i_pts;
if( p_sys->i_late > 10 )
{
- msg_Dbg( p_dec, "late buffer dropped (%i)", i_pts );
+ msg_Dbg( p_dec, "late buffer dropped (%"PRId64")", i_pts );
block_Release( p_block );
return NULL;
}
- lock = var_AcquireMutex( "qt_mutex" );
+ vlc_mutex_lock( &qt_mutex );
if( ( p_pic = p_dec->pf_vout_buffer_new( p_dec ) ) )
{
p_pic->date = i_pts;
}
- vlc_mutex_unlock( lock );
+ vlc_mutex_unlock( &qt_mutex );
block_Release( p_block );
return p_pic;