*****************************************************************************/
#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 (SYS_DARWIN) && !defined(WIN32)
+#if !defined (__APPLE__) && !defined(WIN32)
# define LOADER 1
#endif
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
#include <QuickTime/QuickTimeComponents.h>
#include <QuickTime/Movies.h>
#include <QuickTime/ImageCodec.h>
set_subcategory( SUBCAT_INPUT_VCODEC );
set_callbacks( Open, Close );
- /* create a mutex */
- var_Create( p_module->p_libvlc, "qt_mutex", VLC_VAR_MUTEX );
vlc_module_end();
#define FCC( a, b , c, d ) \
((uint32_t)( ((a)<<24)|((b)<<16)|((c)<<8)|(d)))
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
typedef struct OpaqueSoundConverter* SoundConverter;
#ifndef LOADER
typedef long OSType;
long reserved;
} SoundComponentData;
-#endif /* SYS_DARWIN */
+#endif /* __APPLE__ */
struct decoder_sys_t
{
/* library */
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
#ifdef LOADER
ldt_fs_t *ldt_fs;
#endif /* LOADER */
HMODULE qtml;
- HINSTANCE qtime_qts;
+ HINSTANCE qts;
OSErr (*InitializeQTML) ( long flags );
OSErr (*TerminateQTML) ( void );
-#endif /* SYS_DARWIN */
+#endif /* __APPLE__ */
/* Audio */
int (*SoundConverterOpen) ( const SoundComponentData *,
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 */
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 );
-#ifdef SYS_DARWIN
- /* on OS X QT is not threadsafe */
- vlc_mutex_lock( &p_dec->p_vlc->quicktime_lock );
-#endif
+ 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 SYS_DARWIN
+#ifndef __APPLE__
FreeLibrary( p_sys->qtml );
FreeLibrary( p_sys->qts );
msg_Dbg( p_dec, "FreeLibrary ok." );
#endif
#endif
-#ifdef SYS_DARWIN
- vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock );
-#endif
- vlc_mutex_unlock( lockval.p_address );
+ vlc_mutex_unlock( lock );
- free( p_sys );
+ 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 );
-#ifdef SYS_DARWIN
- /* on OS X QT is not threadsafe */
- vlc_mutex_lock( &p_dec->p_vlc->quicktime_lock );
-#endif
+ vlc_mutex_lock( lock );
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
EnterMovies();
#endif
goto exit_error;
}
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
if( ( i_error = p_sys->InitializeQTML( 6 + 16 ) ) )
{
msg_Dbg( p_dec, "error on InitializeQTML = %d", i_error );
p_sys->i_out = 0;
p_sys->i_out_frames = 0;
-#ifdef SYS_DARWIN
- vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock );
-#endif
- 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
-#ifdef SYS_DARWIN
- vlc_mutex_unlock( &p_dec->p_vlc->quicktime_lock );
-#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 SYS_DARWIN
+#ifdef __APPLE__
EnterMovies();
#endif
goto exit_error;
}
-#ifndef SYS_DARWIN
+#ifndef __APPLE__
if( ( i_result = p_sys->InitializeQTML( 6 + 16 ) ) )
{
msg_Dbg( p_dec, "error on InitializeQTML = %d", (int)i_result );
memset( &icap, 0, sizeof( ImageSubCodecDecompressCapabilities ) );
cres = p_sys->ImageCodecInitialize( p_sys->ci, &icap );
- msg_Dbg( p_dec, "ImageCodecInitialize->0x%X size=%ld (%ld)\n",(int)cres,icap.recordSize,icap.decompressRecordSize);
+ msg_Dbg( p_dec, "ImageCodecInitialize->0x%X size=%d (%d)\n",
+ (int)cres, (int)icap.recordSize, (int)icap.decompressRecordSize);
memset( &cinfo, 0, sizeof( CodecInfo ) );
cres = p_sys->ImageCodecGetCodecInfo( p_sys->ci, &cinfo );
msg_Dbg( p_dec,
- "Flags: compr: 0x%lx decomp: 0x%lx format: 0x%lx\n",
- cinfo.compressFlags, cinfo.decompressFlags, cinfo.formatFlags );
+ "Flags: compr: 0x%x decomp: 0x%x format: 0x%x\n",
+ (unsigned int)cinfo.compressFlags,
+ (unsigned int)cinfo.decompressFlags,
+ (unsigned int)cinfo.formatFlags );
msg_Dbg( p_dec, "quicktime_video: Codec name: %.*s\n",
((unsigned char*)&cinfo.typeName)[0],
((unsigned char*)&cinfo.typeName)+1 );
memcpy( ((char*)&id->clutID) + 2, p_vide + 70, i_vide - 70 );
}
- msg_Dbg( p_dec, "idSize=%ld ver=%d rev=%d vendor=%ld tempQ=%d "
+ msg_Dbg( p_dec, "idSize=%d ver=%d rev=%d vendor=%d tempQ=%d "
"spaQ=%d w=%d h=%d dpi=%d%d dataSize=%d depth=%d frameCount=%d clutID=%d",
- id->idSize, id->version, id->revisionLevel, id->vendor,
+ (int)id->idSize, id->version, id->revisionLevel, (int)id->vendor,
(int)id->temporalQuality, (int)id->spatialQuality,
- id->width, id->height,
+ (int)id->width, (int)id->height,
(int)id->hRes, (int)id->vRes,
(int)id->dataSize,
id->depth,
id->frameCount,
id->clutID );
- p_sys->framedescHandle =
- (ImageDescriptionHandle) p_sys->NewHandleClear( id->idSize );
+ 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 );
msg_Dbg( p_dec, "quicktime_video: ImageCodecPreDecompress cres=0x%X\n",
(int)cres );
- p_dec->fmt_out.i_codec = VLC_FOURCC( 'Y', 'U', 'Y', '2' );
+ es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_FOURCC( 'Y', 'U', 'Y', '2' ));
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;
return NULL;
}
p_block = *pp_block;
-
- if( !p_block->i_buffer )
- {
- block_Release( p_block );
- return NULL;
- }
-
+ *pp_block = NULL;
+
i_pts = p_block->i_pts ? p_block->i_pts : p_block->i_dts;
if( i_pts < mdate() )
{
p_sys->i_late = 0;
}
- msg_Dbg( p_dec, "bufsize: %d",p_block->i_buffer);
+ msg_Dbg( p_dec, "bufsize: %d", p_block->i_buffer);
if( p_sys->i_late > 10 )
{
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;
}
- else
-
- vlc_mutex_unlock( lockval.p_address );
+
+ vlc_mutex_unlock( lock );
block_Release( p_block );
return p_pic;
{
decoder_sys_t *p_sys = p_dec->p_sys;
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
p_sys->SoundConverterOpen = (void*)SoundConverterOpen;
p_sys->SoundConverterClose = (void*)SoundConverterClose;
p_sys->SoundConverterSetInfo = (void*)SoundConverterSetInfo;
return VLC_EGENERIC;
}
- msg_Dbg( p_dec, "Standard init done" );
-#endif /* else SYS_DARWIN */
+ msg_Dbg( p_dec, "standard init done" );
+#endif /* else __APPLE__ */
return VLC_SUCCESS;
}
{
decoder_sys_t *p_sys = p_dec->p_sys;
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
p_sys->FindNextComponent = (void*)FindNextComponent;
p_sys->OpenComponent = (void*)OpenComponent;
p_sys->ImageCodecInitialize = (void*)ImageCodecInitialize;
msg_Err( p_dec, "failed getting proc address" );
return VLC_EGENERIC;
}
-#endif /* SYS_DARWIN */
+#endif /* __APPLE__ */
return VLC_SUCCESS;
}
projects / vlc / blobdiff