#include <vlc_demux.h>
#include <vlc_dialog.h>
+#define QTKIT_VERSION_MIN_REQUIRED 70603
+
#import <QTKit/QTKit.h>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static int Open( vlc_object_t *p_this );
-static void Close( vlc_object_t *p_this );
-static int Demux( demux_t *p_demux );
-static int Control( demux_t *, int, va_list );
+static int Open(vlc_object_t *p_this);
+static void Close(vlc_object_t *p_this);
+static int Demux(demux_t *p_demux);
+static int Control(demux_t *, int, va_list);
/*****************************************************************************
* Module descriptor
*****************************************************************************/
vlc_module_begin()
-set_shortname( N_("QTSound") )
-set_description( N_("QuickTime Sound Capture") )
-set_category( CAT_INPUT )
-set_subcategory( SUBCAT_INPUT_ACCESS )
-add_shortcut( "qtsound" )
-set_capability( "access_demux", 0 )
-set_callbacks( Open, Close )
+set_shortname(N_("QTSound"))
+set_description(N_("QuickTime Sound Capture"))
+set_category(CAT_INPUT)
+set_subcategory(SUBCAT_INPUT_ACCESS)
+add_shortcut("qtsound")
+set_capability("access_demux", 0)
+set_callbacks(Open, Close)
vlc_module_end ()
{
demux_t *p_qtsound;
AudioBuffer *currentAudioBuffer;
+ void *rawAudioData;
UInt32 numberOfSamples;
date_t date;
mtime_t currentPts;
- (id)initWithDemux:(demux_t *)p_demux;
- (void)outputAudioSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection;
- (BOOL)checkCurrentAudioBuffer;
+- (void)freeAudioMem;
- (mtime_t)getCurrentPts;
- (void *)getCurrentAudioBufferData;
- (UInt32)getCurrentTotalDataSize;
@implementation VLCDecompressedAudioOutput : QTCaptureDecompressedAudioOutput
- (id)initWithDemux:(demux_t *)p_demux
{
- if( self = [super init] )
- {
+ if (self = [super init]) {
p_qtsound = p_demux;
currentAudioBuffer = nil;
date_Init(&date, 44100, 1);
}
- (void)dealloc
{
- @synchronized (self)
- {
- free(currentAudioBuffer);
- currentAudioBuffer = nil;
- }
[super dealloc];
}
- (void)outputAudioSampleBuffer:(QTSampleBuffer *)sampleBuffer fromConnection:(QTCaptureConnection *)connection
{
AudioBufferList *tempAudioBufferList;
- block_t *rawAudioData;
UInt32 totalDataSize = 0;
UInt32 count = 0;
- @synchronized (self)
- {
+ @synchronized (self) {
numberOfSamples = [sampleBuffer numberOfSamples];
date_Increment(&date,numberOfSamples);
currentPts = date_Get(&date);
tempAudioBufferList = [sampleBuffer audioBufferListWithOptions:0];
- if (tempAudioBufferList->mNumberBuffers == 2)
- {
+ if (tempAudioBufferList->mNumberBuffers == 2) {
/*
* Compute totalDataSize as sum of all data blocks in the
* audio buffer list:
*/
- for ( count = 0; count < tempAudioBufferList->mNumberBuffers; count++ )
- {
+ for (count = 0; count < tempAudioBufferList->mNumberBuffers; count++)
totalDataSize += tempAudioBufferList->mBuffers[count].mDataByteSize;
- }
+
/*
* Allocate storage for the interleaved audio data
*/
- rawAudioData = block_Alloc(totalDataSize * sizeof(float));
- if (NULL == rawAudioData)
- {
- msg_Err( p_qtsound, "Raw audiodata could not be allocated" );
+ rawAudioData = malloc(totalDataSize);
+ if (NULL == rawAudioData) {
+ msg_Err(p_qtsound, "Raw audiodata could not be allocated");
return;
}
- }
- else
- {
- msg_Err( p_qtsound, "Too many or only one channel found." );
+ } else {
+ msg_Err(p_qtsound, "Too many or only one channel found: %i.",
+ tempAudioBufferList->mNumberBuffers);
return;
}
* Interleave raw data (provided in two separate channels as
* F32L) with 2 samples per frame
*/
- if ( totalDataSize )
- {
+ if (totalDataSize) {
unsigned short i;
const float *b1Ptr, *b2Ptr;
float *uPtr;
uPtr = (float *)rawAudioData,
b1Ptr = (const float *) tempAudioBufferList->mBuffers[0].mData,
b2Ptr = (const float *) tempAudioBufferList->mBuffers[1].mData;
- i < numberOfSamples; i++)
- {
- *uPtr = *b1Ptr;
- uPtr ++;
- b1Ptr ++;
- *uPtr = *b2Ptr;
- uPtr ++;
- b2Ptr ++;
+ i < numberOfSamples; i++) {
+ *uPtr++ = *b1Ptr++;
+ *uPtr++ = *b2Ptr++;
}
- if (currentAudioBuffer == nil)
- {
+ if (currentAudioBuffer == nil) {
currentAudioBuffer = (AudioBuffer *)malloc(sizeof(AudioBuffer));
- if (NULL == currentAudioBuffer)
- {
- msg_Err( p_qtsound, "AudioBuffer could not be allocated." );
+ if (NULL == currentAudioBuffer) {
+ msg_Err(p_qtsound, "AudioBuffer could not be allocated.");
return;
}
}
currentAudioBuffer->mDataByteSize = totalDataSize;
currentAudioBuffer->mData = rawAudioData;
}
- free(rawAudioData);
}
}
return (currentAudioBuffer) ? 1 : 0;
}
+- (void)freeAudioMem
+{
+ FREENULL(rawAudioData);
+}
+
- (mtime_t)getCurrentPts
{
/* FIXME: can this getter be minimized? */
mtime_t pts;
- if( !currentAudioBuffer || currentPts == previousPts )
- {
+ if(!currentAudioBuffer || currentPts == previousPts)
return 0;
- }
- @synchronized (self)
- {
+ @synchronized (self) {
pts = previousPts = currentPts;
}
QTCaptureDevice * audiodevice;
VLCDecompressedAudioOutput * audiooutput;
es_out_id_t *p_es_audio;
- int i_audio_max_buffer_size;
};
/*****************************************************************************
* Open: initialize interface
*****************************************************************************/
-static int Open( vlc_object_t *p_this )
+static int Open(vlc_object_t *p_this)
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
QTCaptureDeviceInput *audioInput;
NSError *o_returnedAudioError;
- if( p_demux->psz_location && *p_demux->psz_location )
- {
+ if(p_demux->psz_location && *p_demux->psz_location)
psz_uid = p_demux->psz_location;
- }
- msg_Dbg( p_demux, "qtsound uid = %s", psz_uid );
+
+ msg_Dbg(p_demux, "qtsound uid = %s", psz_uid);
qtk_curraudiodevice_uid = [[NSString alloc] initWithFormat:@"%s", psz_uid];
pool = [[NSAutoreleasePool alloc] init];
- p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
- if( !p_sys )
+ p_demux->p_sys = p_sys = calloc(1, sizeof(demux_sys_t));
+ if(!p_sys)
return VLC_ENOMEM;
- msg_Dbg( p_demux, "qtsound : uid = %s", [qtk_curraudiodevice_uid UTF8String]);
+ msg_Dbg(p_demux, "qtsound : uid = %s", [qtk_curraudiodevice_uid UTF8String]);
myAudioDevices = [[[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeSound] arrayByAddingObjectsFromArray:[QTCaptureDevice inputDevicesWithMediaType:QTMediaTypeMuxed]] retain];
- if([myAudioDevices count] == 0)
- {
- dialog_FatalWait( p_demux, _("No Audio Input device found"),
+ if([myAudioDevices count] == 0) {
+ dialog_FatalWait(p_demux, _("No Audio Input device found"),
_("Your Mac does not seem to be equipped with a suitable audio input device."
- "Please check your connectors and drivers.") );
- msg_Err( p_demux, "Can't find any Audio device" );
+ "Please check your connectors and drivers."));
+ msg_Err(p_demux, "Can't find any Audio device");
goto error;
}
- int iaudio;
- for(iaudio = 0; iaudio < [myAudioDevices count]; iaudio++){
+ unsigned iaudio;
+ for (iaudio = 0; iaudio < [myAudioDevices count]; iaudio++) {
QTCaptureDevice *qtk_audioDevice;
qtk_audioDevice = [myAudioDevices objectAtIndex:iaudio];
- msg_Dbg( p_demux, "qtsound audio %d/%d localizedDisplayName: %s uniqueID: %s", iaudio, [myAudioDevices count], [[qtk_audioDevice localizedDisplayName] UTF8String], [[qtk_audioDevice uniqueID] UTF8String]);
- if([[[qtk_audioDevice localizedDisplayName]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_curraudiodevice_uid]){
- msg_Dbg( p_demux, "Device found" );
+ msg_Dbg(p_demux, "qtsound audio %u/%lu localizedDisplayName: %s uniqueID: %s", iaudio, [myAudioDevices count], [[qtk_audioDevice localizedDisplayName] UTF8String], [[qtk_audioDevice uniqueID] UTF8String]);
+ if ([[[qtk_audioDevice uniqueID]stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] isEqualToString:qtk_curraudiodevice_uid]) {
+ msg_Dbg(p_demux, "Device found");
break;
}
}
audioInput = nil;
- if(iaudio < [myAudioDevices count]){
+ if(iaudio < [myAudioDevices count])
p_sys->audiodevice = [myAudioDevices objectAtIndex:iaudio];
- }
- else
- {
+ else {
/* cannot find designated audio device, fall back to open default audio device */
msg_Dbg(p_demux, "Cannot find designated uid audio device as %s. Fall back to open default audio device.", [qtk_curraudiodevice_uid UTF8String]);
p_sys->audiodevice = [QTCaptureDevice defaultInputDeviceWithMediaType: QTMediaTypeSound];
}
- if( !p_sys->audiodevice )
- {
- dialog_FatalWait( p_demux, _("No audio input device found"),
+ if(!p_sys->audiodevice) {
+ dialog_FatalWait(p_demux, _("No audio input device found"),
_("Your Mac does not seem to be equipped with a suitable audio input device."
- "Please check your connectors and drivers.") );
- msg_Err( p_demux, "Can't find any Audio device" );
+ "Please check your connectors and drivers."));
+ msg_Err(p_demux, "Can't find any Audio device");
goto error;
}
- if( ![p_sys->audiodevice open: &o_returnedAudioError] )
- {
- msg_Err( p_demux, "Unable to open the audio capture device (%d)", [o_returnedAudioError code] );
+ if(![p_sys->audiodevice open: &o_returnedAudioError]) {
+ msg_Err(p_demux, "Unable to open the audio capture device (%ld)", [o_returnedAudioError code]);
goto error;
}
- if( [p_sys->audiodevice isInUseByAnotherApplication] == YES )
- {
- msg_Err( p_demux, "default audio capture device is exclusively in use by another application" );
+ if([p_sys->audiodevice isInUseByAnotherApplication] == YES) {
+ msg_Err(p_demux, "default audio capture device is exclusively in use by another application");
goto error;
}
audioInput = [[QTCaptureDeviceInput alloc] initWithDevice: p_sys->audiodevice];
- if( !audioInput )
- {
- msg_Err( p_demux, "can't create a valid audio capture input facility" );
+ if(!audioInput) {
+ msg_Err(p_demux, "can't create a valid audio capture input facility");
goto error;
- } else {
- msg_Dbg( p_demux, "created valid audio capture input facility" );
- }
+ } else
+ msg_Dbg(p_demux, "created valid audio capture input facility");
p_sys->audiooutput = [[VLCDecompressedAudioOutput alloc] initWithDemux:p_demux];
- msg_Dbg ( p_demux, "initialized audio output" );
+ msg_Dbg (p_demux, "initialized audio output");
/* Get the formats */
/*
*/
audioformat_array = [p_sys->audiodevice formatDescriptions];
audio_format = NULL;
- for( int k = 0; k < [audioformat_array count]; k++ )
- {
- audio_format = (QTFormatDescription *)[audioformat_array objectAtIndex: k];
+ for(int k = 0; k < [audioformat_array count]; k++) {
+ audio_format = (QTFormatDescription *)[audioformat_array objectAtIndex:k];
- msg_Dbg( p_demux, "Audio localized format summary: %s", [[audio_format localizedFormatSummary] UTF8String]);
- msg_Dbg( p_demux, "Audio format description attributes: %s",[[[audio_format formatDescriptionAttributes] description] UTF8String]);
+ msg_Dbg(p_demux, "Audio localized format summary: %s", [[audio_format localizedFormatSummary] UTF8String]);
+ msg_Dbg(p_demux, "Audio format description attributes: %s",[[[audio_format formatDescriptionAttributes] description] UTF8String]);
AudioStreamBasicDescription asbd = {0};
NSValue *asbdValue = [audio_format attributeForKey:QTFormatDescriptionAudioStreamBasicDescriptionAttribute];
/* kept for development purposes */
#if 0
- msg_Dbg( p_demux, "Sample Rate: %.0lf; Format ID: %s; Format Flags: %.8x; Bytes per Packet: %d; Frames per Packet: %d; Bytes per Frame: %d; Channels per Frame: %d; Bits per Channel: %d",
+ msg_Dbg(p_demux, "Sample Rate: %.0lf; Format ID: %s; Format Flags: %.8x; Bytes per Packet: %d; Frames per Packet: %d; Bytes per Frame: %d; Channels per Frame: %d; Bits per Channel: %d",
asbd.mSampleRate,
formatIDString,
asbd.mFormatFlags,
asbd.mChannelsPerFrame,
asbd.mBitsPerChannel);
- msg_Dbg( p_demux, "Flag float %d bigEndian %d signedInt %d packed %d alignedHigh %d non interleaved %d non mixable %d\ncanonical %d nativeFloatPacked %d nativeEndian %d",
+ msg_Dbg(p_demux, "Flag float %d bigEndian %d signedInt %d packed %d alignedHigh %d non interleaved %d non mixable %d\ncanonical %d nativeFloatPacked %d nativeEndian %d",
(asbd.mFormatFlags & kAudioFormatFlagIsFloat) != 0,
(asbd.mFormatFlags & kAudioFormatFlagIsBigEndian) != 0,
(asbd.mFormatFlags & kAudioFormatFlagIsSignedInteger) != 0,
(asbd.mFormatFlags & kAudioFormatFlagsCanonical) != 0,
(asbd.mFormatFlags & kAudioFormatFlagsNativeFloatPacked) != 0,
(asbd.mFormatFlags & kAudioFormatFlagsNativeEndian) != 0
- );
+ );
#endif
}
- if( [audioformat_array count] )
- audio_format = [audioformat_array objectAtIndex: 0];
- else goto error;
+ if([audioformat_array count])
+ audio_format = [audioformat_array objectAtIndex:0];
+ else
+ goto error;
/* Now we can init */
audiocodec = VLC_CODEC_FL32;
- es_format_Init( &audiofmt, AUDIO_ES, audiocodec);
+ es_format_Init(&audiofmt, AUDIO_ES, audiocodec);
audiofmt.audio.i_format = audiocodec;
audiofmt.audio.i_rate = 44100;
* before downmixing, the buffer is derived.
*/
audiofmt.audio.i_original_channels = AOUT_CHAN_RIGHT | AOUT_CHAN_LEFT;
- /*
- * i_bytes_per_frame Optional - for A/52, SPDIF and DTS types:
- * Bytes used by one compressed frame, depends on bitrate.
- */
- audiofmt.audio.i_bytes_per_frame = 4;
- /*
- * Number of sampleframes contained in one compressed frame.
- */
- audiofmt.audio.i_frame_length = 1;
/*
* Please note that it may be completely arbitrary - buffers are not
* obliged to contain a integral number of so-called "frames". It's
*/
audiofmt.audio.i_bitspersample = 32;
audiofmt.audio.i_channels = 2;
- audiofmt.audio.i_blockalign = audiofmt.audio.i_channels * audiofmt.audio.i_bitspersample / 16;
+ audiofmt.audio.i_blockalign = audiofmt.audio.i_channels * (audiofmt.audio.i_bitspersample / 8);
audiofmt.i_bitrate = audiofmt.audio.i_channels * audiofmt.audio.i_rate * audiofmt.audio.i_bitspersample;
- p_sys->i_audio_max_buffer_size = 4096;
p_sys->session = [[QTCaptureSession alloc] init];
success = [p_sys->session addInput:audioInput error: &o_returnedAudioError];
- if( !success )
- {
- msg_Err( p_demux, "the audio capture device could not be added to capture session (%d)", [o_returnedAudioError code] );
+ if(!success) {
+ msg_Err(p_demux, "the audio capture device could not be added to capture session (%ld)", [o_returnedAudioError code]);
goto error;
}
success = [p_sys->session addOutput:p_sys->audiooutput error: &o_returnedAudioError];
- if( !success )
- {
- msg_Err( p_demux, "audio output could not be added to capture session (%d)", [o_returnedAudioError code] );
+ if(!success) {
+ msg_Err(p_demux, "audio output could not be added to capture session (%ld)", [o_returnedAudioError code]);
goto error;
}
p_demux->info.i_title = 0;
p_demux->info.i_seekpoint = 0;
- msg_Dbg( p_demux, "New audio es %d channels %dHz",
- audiofmt.audio.i_channels, audiofmt.audio.i_rate );
+ msg_Dbg(p_demux, "New audio es %d channels %dHz",
+ audiofmt.audio.i_channels, audiofmt.audio.i_rate);
- p_sys->p_es_audio = es_out_Add( p_demux->out, &audiofmt );
+ p_sys->p_es_audio = es_out_Add(p_demux->out, &audiofmt);
[audioInput release];
[pool release];
- msg_Dbg( p_demux, "QTSound: We have an audio device ready!" );
+ msg_Dbg(p_demux, "QTSound: We have an audio device ready!");
return VLC_SUCCESS;
error:
[audioInput release];
[pool release];
- free( p_sys );
+ free(p_sys);
return VLC_EGENERIC;
}
/*****************************************************************************
* Close: destroy interface
*****************************************************************************/
-static void Close( vlc_object_t *p_this )
+static void Close(vlc_object_t *p_this)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
demux_t *p_demux = (demux_t*)p_this;
[p_sys->audiooutput performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
[p_sys->session performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
- free( p_sys );
+ free(p_sys);
[pool release];
}
/*****************************************************************************
* Demux:
*****************************************************************************/
-static int Demux( demux_t *p_demux )
+static int Demux(demux_t *p_demux)
{
demux_sys_t *p_sys = p_demux->p_sys;
- block_t *p_blocka;
+ block_t *p_blocka = nil;
NSAutoreleasePool *pool;
- p_blocka = block_New( p_demux, p_sys->i_audio_max_buffer_size );
- if( !p_blocka )
- {
- msg_Err( p_demux, "cannot get audio block" );
- return 0;
- }
- pool = [[NSAutoreleasePool alloc] init];
+ @synchronized (p_sys->audiooutput) {
+ if ([p_sys->audiooutput checkCurrentAudioBuffer]) {
+ unsigned i_buffer_size = [p_sys->audiooutput getCurrentTotalDataSize];
+ p_blocka = block_Alloc(i_buffer_size);
- @synchronized (p_sys->audiooutput)
- {
- if ( [p_sys->audiooutput checkCurrentAudioBuffer] )
- {
- p_blocka->i_pts = [p_sys->audiooutput getCurrentPts];
- p_blocka->p_buffer = [p_sys->audiooutput getCurrentAudioBufferData];
+ if(!p_blocka) {
+ msg_Err(p_demux, "cannot get audio block");
+ return 0;
+ }
+
+ memcpy(p_blocka->p_buffer, [p_sys->audiooutput getCurrentAudioBufferData], i_buffer_size);
p_blocka->i_nb_samples = [p_sys->audiooutput getNumberOfSamples];
- p_blocka->i_buffer = [p_sys->audiooutput getCurrentTotalDataSize];
- }
- }
+ p_blocka->i_pts = [p_sys->audiooutput getCurrentPts];
- if( !p_blocka->i_pts )
- {
- // Nothing to transfer yet, just forget
- block_Release( p_blocka );
- [pool release];
- msleep( 10000 );
- return 1;
+ [p_sys->audiooutput freeAudioMem];
+ }
}
- [pool release];
+ if (p_blocka) {
+ if (!p_blocka->i_pts) {
+ // Nothing to transfer yet, just forget
+ msleep(10000);
+ return 1;
+ }
- if( p_blocka )
- {
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_blocka->i_pts );
- es_out_Send( p_demux->out, p_sys->p_es_audio, p_blocka );
+ es_out_Control(p_demux->out, ES_OUT_SET_PCR, p_blocka->i_pts);
+ es_out_Send(p_demux->out, p_sys->p_es_audio, p_blocka);
}
return 1;
/*****************************************************************************
* Control:
*****************************************************************************/
-static int Control( demux_t *p_demux, int i_query, va_list args )
+static int Control(demux_t *p_demux, int i_query, va_list args)
{
bool *pb;
int64_t *pi64;
- switch( i_query )
- {
+ switch(i_query) {
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_CAN_SEEK:
case DEMUX_SET_PAUSE_STATE:
case DEMUX_CAN_CONTROL_PACE:
- pb = (bool*)va_arg( args, bool * );
+ pb = (bool*)va_arg(args, bool *);
*pb = false;
return VLC_SUCCESS;
case DEMUX_GET_PTS_DELAY:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = INT64_C(1000) * var_InheritInteger( p_demux, "live-caching" );
+ pi64 = (int64_t*)va_arg(args, int64_t *);
+ *pi64 = INT64_C(1000) * var_InheritInteger(p_demux, "live-caching");
return VLC_SUCCESS;
default:
projects / vlc / blobdiff