*****************************************************************************/
#include <vlc/vlc.h>
-#include <vlc/aout.h>
-#include <vlc/vout.h>
-#include <vlc/decoder.h>
+#include <vlc_aout.h>
+#include <vlc_vout.h>
+#include <vlc_codec.h>
#if !defined (__APPLE__) && !defined(WIN32)
# define LOADER 1
static int Open( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
+ if( var_GetGlobalMutex( "qt_mutex" ) == NULL )
+ return VLC_EGENERIC;
/* create a mutex */
- var_Create( p_this->p_libvlc, "qt_mutex", VLC_VAR_MUTEX );
-
switch( p_dec->fmt_in.i_codec )
{
case VLC_FOURCC('S','V','Q','3'): /* Sorenson v3 */
- /* case VLC_FOURCC('S','V','Q','1'): Sorenson v1
+ /* case VLC_FOURCC('S','V','Q','1'): Sorenson v1
case VLC_FOURCC('Z','y','G','o'):
case VLC_FOURCC('V','P','3','1'):
case VLC_FOURCC('3','I','V','1'): */
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
- vlc_value_t lockval;
+ vlc_mutex_t *lock;
/* get lock, avoid segfault */
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ lock = var_GetGlobalMutex( "qt_mutex" );
+ vlc_mutex_lock( lock );
if( p_dec->fmt_out.i_cat == AUDIO_ES )
{
i_error = p_sys->SoundConverterClose( p_sys->myConverter );
msg_Dbg( p_dec, "SoundConverterClose => %d", i_error );
- if( p_sys->p_buffer ) free( p_sys->p_buffer );
+ free( p_sys->p_buffer );
}
else if( p_dec->fmt_out.i_cat == VIDEO_ES )
{
- if( p_sys->plane) free( p_sys->plane );
+ free( p_sys->plane );
}
#ifndef __APPLE__
#endif
#endif
- vlc_mutex_unlock( lockval.p_address );
- var_Destroy( p_dec->p_libvlc, "qt_mutex" );
+ vlc_mutex_unlock( lock );
if( p_sys ) free( p_sys );
}
*****************************************************************************/
static int OpenAudio( decoder_t *p_dec )
{
- decoder_sys_t *p_sys = malloc( sizeof( decoder_sys_t ) );
+ decoder_sys_t *p_sys;
+ vlc_mutex_t *lock = var_GetGlobalMutex( "qt_mutex" );
- vlc_value_t lockval;
int i_error;
char fcc[4];
unsigned long WantedBufferSize;
unsigned long InputBufferSize = 0;
unsigned long OutputBufferSize = 0;
- memset( p_sys, 0, sizeof( decoder_sys_t ) );
+ if( lock == NULL )
+ return VLC_EGENERIC;
+ p_sys = calloc( sizeof( decoder_sys_t ), 1 );
p_dec->p_sys = p_sys;
p_dec->pf_decode_audio = DecodeAudio;
memcpy( fcc, &p_dec->fmt_in.i_codec, 4 );
/* get lock, avoid segfault */
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( lock );
#ifdef __APPLE__
EnterMovies();
p_sys->i_out = 0;
p_sys->i_out_frames = 0;
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
return VLC_SUCCESS;
exit_error:
#ifdef LOADER
Restore_LDT_Keeper( p_sys->ldt_fs );
#endif
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
free( p_sys );
return VLC_EGENERIC;
{
decoder_sys_t *p_sys = p_dec->p_sys;
- vlc_value_t lockval;
block_t *p_block;
int i_error;
{
int i_frames = p_sys->i_buffer / p_sys->InFrameSize;
unsigned long i_out_frames, i_out_bytes;
+ vlc_mutex_t *lock = var_GetGlobalMutex( "qt_mutex ");
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ vlc_mutex_lock( lock );
i_error = p_sys->SoundConverterConvertBuffer( p_sys->myConverter,
p_sys->p_buffer,
i_frames,
p_sys->out_buffer,
&i_out_frames,
&i_out_bytes );
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
/*
msg_Dbg( p_dec, "decoded %d frames -> %ld frames (error=%d)",
decoder_sys_t *p_sys = malloc( sizeof( decoder_sys_t ) );
#ifndef WIN32
- vlc_value_t lockval;
+ 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 */
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+ lock = var_GetGlobalMutex( "qt_mutex" );
+ vlc_mutex_lock( lock );
#ifdef __APPLE__
EnterMovies();
p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width;
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( lockval.p_address );
+
+ vlc_mutex_unlock( lock );
return VLC_SUCCESS;
exit_error:
#ifdef LOADER
Restore_LDT_Keeper( p_sys->ldt_fs );
#endif
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
#endif /* !WIN32 */
static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- vlc_value_t lockval;
+ vlc_mutex_t *lock;
block_t *p_block;
picture_t *p_pic;
mtime_t i_pts;
}
p_block = *pp_block;
*pp_block = NULL;
-
+
i_pts = p_block->i_pts ? p_block->i_pts : p_block->i_dts;
if( i_pts < mdate() )
block_Release( p_block );
return NULL;
}
-
- var_Get( p_dec->p_libvlc, "qt_mutex", &lockval );
- vlc_mutex_lock( lockval.p_address );
+
+ lock = var_GetGlobalMutex( "qt_mutex" );
+ vlc_mutex_lock( lock );
if( ( p_pic = p_dec->pf_vout_buffer_new( p_dec ) ) )
{
p_dec->fmt_in.video.i_width * p_dec->fmt_in.video.i_height * 2 );
p_pic->date = i_pts;
}
-
- vlc_mutex_unlock( lockval.p_address );
+
+ vlc_mutex_unlock( lock );
block_Release( p_block );
return p_pic;
return VLC_EGENERIC;
}
- msg_Dbg( p_dec, "Standard init done" );
+ msg_Dbg( p_dec, "standard init done" );
#endif /* else __APPLE__ */
return VLC_SUCCESS;