#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_aout.h>
-#include <vlc_vout.h>
#include <vlc_codec.h>
#if !defined (__APPLE__) && !defined(WIN32)
static int OpenVideo( decoder_t * );
static aout_buffer_t *DecodeAudio( decoder_t *, block_t ** );
+#ifndef WIN32
static picture_t *DecodeVideo( decoder_t *, block_t ** );
+#endif
#define FCC( a, b , c, d ) \
((uint32_t)( ((a)<<24)|((b)<<16)|((c)<<8)|(d)))
/* Output properties */
uint8_t * plane;
mtime_t pts;
- audio_date_t date;
+ date_t date;
int i_late; /* video */
};
static int QTAudioInit( decoder_t * );
+#ifndef WIN32
static int QTVideoInit( decoder_t * );
+#endif
/*****************************************************************************
* Open: probe the decoder and return score
#ifdef __APPLE__
OSErr err;
SInt32 qtVersion, macosversion;
-
+
err = Gestalt(gestaltQuickTimeVersion, &qtVersion);
err = Gestalt(gestaltSystemVersion, &macosversion);
#ifndef NDEBUG
}
- es_format_Init( &p_dec->fmt_out, AUDIO_ES, AOUT_FMT_S16_NE );
+ es_format_Init( &p_dec->fmt_out, AUDIO_ES, VLC_CODEC_S16N );
p_dec->fmt_out.audio.i_rate = p_sys->OutputFormatInfo.sampleRate;
p_dec->fmt_out.audio.i_channels = p_sys->OutputFormatInfo.numChannels;
p_dec->fmt_out.audio.i_physical_channels =
p_dec->fmt_out.audio.i_original_channels =
pi_channels_maps[p_sys->OutputFormatInfo.numChannels];
- aout_DateInit( &p_sys->date, p_dec->fmt_out.audio.i_rate );
+ date_Init( &p_sys->date, p_dec->fmt_out.audio.i_rate, 1 );
p_sys->i_buffer = 0;
p_sys->i_buffer_size = 100*1000;
}
if( p_sys->pts != 0 &&
- p_sys->pts != aout_DateGet( &p_sys->date ) )
+ p_sys->pts != date_Get( &p_sys->date ) )
{
- aout_DateSet( &p_sys->date, p_sys->pts );
+ date_Set( &p_sys->date, p_sys->pts );
}
- else if( !aout_DateGet( &p_sys->date ) )
+ else if( !date_Get( &p_sys->date ) )
{
return NULL;
}
if( p_out )
{
- p_out->start_date = aout_DateGet( &p_sys->date );
- p_out->end_date = aout_DateIncrement( &p_sys->date, i_frames );
+ p_out->start_date = date_Get( &p_sys->date );
+ p_out->end_date = date_Increment( &p_sys->date, i_frames );
memcpy( p_out->p_buffer,
&p_sys->out_buffer[2 * p_sys->i_out * p_dec->fmt_out.audio.i_channels],
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( &qt_mutex );
return VLC_SUCCESS;
#endif
vlc_mutex_unlock( &qt_mutex );
+#else
+ VLC_UNUSED( p_dec );
#endif /* !WIN32 */
return VLC_EGENERIC;