* $Id$
*
* Authors: Laurent Aimar <fenrir at via.ecp.fr>
- * Derk-Jan Hartman <thedj at users.sf.net>
+ * Derk-Jan Hartman <hartman at videolan.org>>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
vlc_module_begin();
set_description( N_("QuickTime library decoder") );
- set_capability( "decoder", 100 );
+ set_capability( "decoder", 10 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_VCODEC );
set_callbacks( Open, Close );
#ifdef __APPLE__
OSErr err;
- SInt32 qtVersion;
+ SInt32 qtVersion, macosversion;
err = Gestalt(gestaltQuickTimeVersion, &qtVersion);
+ err = Gestalt(gestaltSystemVersion, &macosversion);
+#ifndef NDEBUG
+ msg_Dbg( p_this, "mac os version is %#lx", macosversion );
+ msg_Dbg( p_this, "quicktime version is %#lx", qtVersion );
+#endif
#endif
switch( p_dec->fmt_in.i_codec )
{
case VLC_FOURCC('h','2','6','4'): /* H.264 */
+ case VLC_FOURCC('c','v','i','d'): /* Cinepak */
+ case VLC_FOURCC('I','V','4','1'): /* Indeo Video IV */
+ case VLC_FOURCC('i','v','4','1'): /* dto. */
+#ifdef __APPLE__
+ case VLC_FOURCC('p','x','l','t'): /* Pixlet */
+#endif
+ case VLC_FOURCC('d','v','1','n'): /* DVC Pro 100 NTSC */
+ case VLC_FOURCC('d','v','1','p'): /* DVC Pro 100 PAL */
+ case VLC_FOURCC('d','v','h','p'): /* DVC PRO HD 720p */
+ case VLC_FOURCC('d','v','h','6'): /* DVC PRO HD 1080i 60 */
+ case VLC_FOURCC('d','v','h','5'): /* DVC PRO HD 1080i 50 */
+
case VLC_FOURCC('S','V','Q','3'): /* Sorenson v3 */
/* case VLC_FOURCC('S','V','Q','1'): Sorenson v1
case VLC_FOURCC('Z','y','G','o'):
case VLC_FOURCC('r','p','z','a'): /* QuickTime Apple Video */
case VLC_FOURCC('a','z','p','r'): /* QuickTime animation (RLE) */
#ifdef LOADER
- p_dec->p_sys = NULL;
- p_dec->pf_decode_video = DecodeVideo;
- return VLC_SUCCESS;
+ p_dec->p_sys = NULL;
+ p_dec->pf_decode_video = DecodeVideo;
+ return VLC_SUCCESS;
#else
- return OpenVideo( p_dec );
+ return OpenVideo( p_dec );
#endif
#ifdef __APPLE__
case VLC_FOURCC('I','L','B','C'): /* iLBC */
- if ((err == noErr) && (qtVersion < 0x07500000))
+ if ((err != noErr) || (qtVersion < 0x07500000))
return VLC_EGENERIC;
case VLC_FOURCC('i','l','b','c'): /* iLBC */
- if ((err == noErr) && (qtVersion < 0x07500000))
+ if ((err != noErr) || (qtVersion < 0x07500000))
return VLC_EGENERIC;
#endif
case VLC_FOURCC('s','a','m','r'): /* 3GPP AMR audio */
+ case VLC_FOURCC('s','a','m','b'): /* 3GPP AMR-WB audio */
case VLC_FOURCC('m','p','4','a'): /* MPEG-4 audio */
case VLC_FOURCC('Q','D','M','C'): /* QDesign */
case VLC_FOURCC('Q','D','M','2'): /* QDesign* 2 */
case 0x6D730002: /* Microsoft ADPCM-ACM */
case 0x6D730011: /* DVI Intel IMAADPCM-ACM */
#ifdef LOADER
- p_dec->p_sys = NULL;
- p_dec->pf_decode_audio = DecodeAudio;
- return VLC_SUCCESS;
+ p_dec->p_sys = NULL;
+ p_dec->pf_decode_audio = DecodeAudio;
+ return VLC_SUCCESS;
#else
- return OpenAudio( p_dec );
+
+#ifdef __APPLE__
+ /* FIXME: right now, we don't support audio decoding on 10.5 and later
+ because we are still using the hardcore-outdated SoundManager API,
+ which was removed after 10.4 */
+
+ if( macosversion >= 0x1050 || err != noErr )
+ {
+ msg_Warn( p_dec, "Your Mac OS version doesn't have SoundManager anymore. "
+ "You can't use this plugin for audio." );
+ return VLC_EGENERIC;
+ }
+#endif
+ return OpenAudio( p_dec );
#endif
default:
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_sys->i_late = 0;
}
- msg_Dbg( p_dec, "bufsize: %d", p_block->i_buffer);
+#ifndef NDEBUG
+ msg_Dbg( p_dec, "bufsize: %d", (int)p_block->i_buffer);
+#endif
if( p_sys->i_late > 10 )
{
- msg_Dbg( p_dec, "too late buffer -> dropped" );
+ msg_Dbg( p_dec, "late buffer dropped (%"PRId64")", i_pts );
block_Release( p_block );
return NULL;
}