Changeset 1322:8da3bcb947c5 in mediastreamer2

Timestamp:

Mar 23, 2011 4:45:35 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

new audio unit based filter for macosx.

Files:

• configure.ac (modified) (2 diffs)
• src/macsnd.c (modified) (15 diffs)
• src/mssndcard.c (modified) (1 diff)

configure.ac

@@ -336 +336 @@
 
 AC_ARG_ENABLE(macsnd,
-      [  --enable-macsnd    Turn on native macosx sound support (default=no)],
+      [  --enable-macsnd    Turn on Audio Units macosx sound support (default=yes)],
       [case "${enableval}" in
         yes) macsnd=true ;;
         no)  macsnd=false ;;
         *) AC_MSG_ERROR(bad value ${enableval} for --enable-macsnd) ;;
-      esac],[macsnd=false])
-
-if test "$macsnd" = "true"; then
-        AC_DEFINE(__MACSND_ENABLED__,1,[defined if native macosx sound support is available])
-        macsnd_enabled=true
-        found_sound=yes
-fi
-
-AM_CONDITIONAL(BUILD_MACSND, test x$macsnd_enabled = xtrue)
+      esac],[macsnd=true])
 
 AC_ARG_ENABLE(macaqsnd,
-      [  --enable-macaqsnd    Turn on native macosx Audio Queue sound support (default=yes)],
+      [  --enable-macaqsnd    Turn on native macosx Audio Queue sound support (default=no)],
       [case "${enableval}" in
         yes) macaqsnd=true ;;
@@ -359 +351 @@
       esac],[macaqsnd=true])
 
-if test "$macosx_found" != "yes" ; then
-        macaqsnd=false
-fi
-
-if test "$macaqsnd" = "true"; then
-        AC_DEFINE(__MAC_AQ_ENABLED__,1,[defined if native macosx AQ sound support is available])
-        found_sound=yes
-fi
-
+
+
+if test "$macosx_found" = "yes" ; then
+        if test "$macsnd" = "true"; then
+                AC_DEFINE(__MACSND_ENABLED__,1,[defined if native macosx sound support is available])
+                macsnd_enabled=true
+                found_sound=yes
+        fi
+        if test "$macaqsnd" = "true"; then
+                AC_DEFINE(__MAC_AQ_ENABLED__,1,[defined if native macosx AQ sound support is available])
+                found_sound=yes
+                macaqsnd=true
+        fi
+fi
+
+
+AM_CONDITIONAL(BUILD_MACSND, test x$macsnd_enabled = xtrue)
 AM_CONDITIONAL(BUILD_MACAQSND, test x$macaqsnd = xtrue)
 
 AC_ARG_ENABLE(iounit,
-      [  --enable-iounit    Turn on native apple iounit support (default=no)],
+      [  --enable-iounit    Turn on native iOS audio unit support (default=no)],
       [case "${enableval}" in
         yes) iounit=true ;;

src/macsnd.c

@@ -60 +60 @@
 #define CHECK_AURESULT(call)    do{ int _err; if ((_err=(call))!=noErr) ms_error( #call ": error [%i] %s %s",_err,GetMacOSStatusErrorString(_err),GetMacOSStatusCommentString(_err)); }while(0)
 
+static void show_format(const char *name, AudioStreamBasicDescription * deviceFormat)
+{
+        ms_message("Format for %s", name);
+        ms_message("mSampleRate = %g", deviceFormat->mSampleRate);
+        unsigned int fcc= ntohl(deviceFormat->mFormatID);
+        char outName[5];
+        memcpy(outName,&fcc,4);
+        outName[4] = 0;
+        ms_message("mFormatID = %s", outName);
+        ms_message("mFormatFlags = %08lX", deviceFormat->mFormatFlags);
+        ms_message("mBytesPerPacket = %ld", deviceFormat->mBytesPerPacket);
+        ms_message("mFramesPerPacket = %ld", deviceFormat->mFramesPerPacket);
+        ms_message("mChannelsPerFrame = %ld", deviceFormat->mChannelsPerFrame);
+        ms_message("mBytesPerFrame = %ld", deviceFormat->mBytesPerFrame);
+        ms_message("mBitsPerChannel = %ld", deviceFormat->mBitsPerChannel);
+}
+
+
 typedef struct AUCommon{
         int dev;
@@ -83 +101 @@
         AudioDeviceID dev;
         int removed;
+        int rate; /*the nominal rate of the device*/
 } AuCard;
 
@@ -148 +167 @@
 {
         MSSndCard *card = ms_snd_card_new(&ca_card_desc);
+        AudioStreamBasicDescription format;
         AuCard *d = (AuCard *) card->data;
+        unsigned int slen;
+        int err;
+
         d->uidname = ms_strdup(uidname);
         d->dev = dev;
         card->name = ms_strdup(name);
         card->capabilities = cap;
+        
+        slen = sizeof(format);
+        d->rate=44100;
+        err = AudioDeviceGetProperty(dev, 0, cap & MS_SND_CARD_CAP_CAPTURE, kAudioDevicePropertyStreamFormat, &slen, &format);
+        if (err == kAudioHardwareNoError) {
+                show_format("output device", &format);
+                d->rate=format.mSampleRate;
+        }
         return card;
-}
-
-static void show_format(const char *name, AudioStreamBasicDescription * deviceFormat)
-{
-        ms_message("Format for %s", name);
-        ms_message("mSampleRate = %g", deviceFormat->mSampleRate);
-        char *the4CCString = (char *) &deviceFormat->mFormatID;
-        char outName[5];
-        outName[0] = the4CCString[0];
-        outName[1] = the4CCString[1];
-        outName[2] = the4CCString[2];
-        outName[3] = the4CCString[3];
-        outName[4] = 0;
-        ms_message("mFormatID = %s", outName);
-        ms_message("mFormatFlags = %08lX", deviceFormat->mFormatFlags);
-        ms_message("mBytesPerPacket = %ld", deviceFormat->mBytesPerPacket);
-        ms_message("mFramesPerPacket = %ld", deviceFormat->mFramesPerPacket);
-        ms_message("mChannelsPerFrame = %ld", deviceFormat->mChannelsPerFrame);
-        ms_message("mBytesPerFrame = %ld", deviceFormat->mBytesPerFrame);
-        ms_message("mBitsPerChannel = %ld", deviceFormat->mBitsPerChannel);
 }
 
@@ -222 +233 @@
         ms_message("CA: devname:%s uidname:%s", devname, uidname);
                         
-        AudioStreamBasicDescription devicewriteFormat;
-        slen = sizeof(devicewriteFormat);
-        err = AudioDeviceGetProperty(id, 0, is_input, kAudioDevicePropertyStreamFormat, &slen, &devicewriteFormat);
-        if (err == kAudioHardwareNoError) {
-                show_format("output device", &devicewriteFormat);
-        }
+        
         return ret;
 }
@@ -278 +284 @@
 {
         AURead *d=(AURead*)inRefCon;
-        
-        CHECK_AURESULT(AudioUnitRender(d->common.au, inActionFlags, inTimeStamp, inBusNumber,
-                                                  inNumFrames, ioData));
-        if( ioData==NULL)
-        {
+        AudioBufferList lreadAudioBufferList={0};
+        mblk_t *rm;
+        OSStatus err;
+
+        
+
+        lreadAudioBufferList.mNumberBuffers=1;
+        lreadAudioBufferList.mBuffers[0].mDataByteSize=inNumFrames*sizeof(int16_t)*d->common.nchannels;
+        rm=allocb(lreadAudioBufferList.mBuffers[0].mDataByteSize,0);
+        lreadAudioBufferList.mBuffers[0].mData=rm->b_wptr;
+        lreadAudioBufferList.mBuffers[0].mNumberChannels = 1;
+
+        //ms_message("request to render %i bytes, inNumFrames=%i",lreadAudioBufferList.mBuffers[0].mDataByteSize,inNumFrames);
+        err=AudioUnitRender(d->common.au, inActionFlags, inTimeStamp, inBusNumber, inNumFrames, &lreadAudioBufferList);
+        
+        if (err!=noErr){
+                ms_error("AudioUnitRender() for read returned [%i] %s %s",err,GetMacOSStatusErrorString(err),GetMacOSStatusCommentString(err));
                 return 0;
         }
-        ms_message("Got input buffer of size %i",ioData->mBuffers[0].mDataByteSize);
-        mblk_t *rm=NULL;
-        rm=allocb(ioData->mBuffers[0].mDataByteSize,0);
-        memcpy(rm->b_wptr, ioData->mBuffers[0].mData, ioData->mBuffers[0].mDataByteSize);
-        rm->b_wptr+=ioData->mBuffers[0].mDataByteSize;
+        //ms_message("Got input buffer of size %i",lreadAudioBufferList.mBuffers[0].mDataByteSize);
+
+        rm->b_wptr+=lreadAudioBufferList.mBuffers[0].mDataByteSize;
         
         ms_mutex_lock(&d->common.mutex);
         putq(&d->rq,rm);
         ms_mutex_unlock(&d->common.mutex);
-        rm=NULL;
-        
+
         return 0;
 }
@@ -306 +321 @@
                                                  AudioBufferList *ioData)
 {
-        OSStatus err= noErr;
         AUWrite *d=(AUWrite*)inRefCon;
         int read;
+
+        if (ioData->mNumberBuffers!=1) ms_warning("writeRenderProc: %i buffers",ioData->mNumberBuffers);
         ms_mutex_lock(&d->common.mutex);
         read=ms_bufferizer_read(d->buffer,ioData->mBuffers[0].mData,ioData->mBuffers[0].mDataByteSize);
@@ -315 +331 @@
                 ms_warning("Silence inserted in audio output unit (%i bytes)",ioData->mBuffers[0].mDataByteSize);
                 memset(ioData->mBuffers[0].mData,0,ioData->mBuffers[0].mDataByteSize);
-        }
-        err = AudioUnitRender(d->common.au, inActionFlags, inTimeStamp, inBusNumber,inNumFrames, ioData);
-        if(err != noErr){
-                ms_error("AudioUnitRender() failed for write: %i",err);
         }
         return 0;
@@ -375 +387 @@
                                   kAudioOutputUnitProperty_CurrentDevice,
                                   kAudioUnitScope_Global,
-                                  0,
+                                  output_bus,
                                   &d->dev,
                                   sizeof(AudioDeviceID)));
         
+
+        param=0;
+        CHECK_AURESULT(AudioUnitSetProperty(d->au,
+                                          kAudioUnitProperty_ShouldAllocateBuffer,
+                                          is_read ? kAudioUnitScope_Input : kAudioUnitScope_Output ,
+                                          is_read ? input_bus : output_bus ,
+                                          &param,
+                                          sizeof(param)));
+
         UInt32 asbdsize = sizeof(AudioStreamBasicDescription);
         memset((char *)&asbd, 0, asbdsize);
@@ -390 +411 @@
         
         show_format(is_read ? "Input audio unit" : "Output audio unit",&asbd);
-        if (asbd.mChannelsPerFrame>1)
-        {
-                asbd.mBytesPerFrame = asbd.mBytesPerFrame / asbd.mChannelsPerFrame;
-                asbd.mBytesPerPacket = asbd.mBytesPerPacket / asbd.mChannelsPerFrame;           
-                asbd.mChannelsPerFrame = 1;
-        }
+        
+        asbd.mSampleRate=d->rate;
+                        
+        asbd.mBytesPerPacket=asbd.mBytesPerFrame = 2*d->nchannels;
+        asbd.mChannelsPerFrame = d->nchannels;
+        asbd.mBitsPerChannel=16;
+        asbd.mFormatID=kAudioFormatLinearPCM;
+        asbd.mFormatFlags=kAudioFormatFlagIsPacked|kAudioFormatFlagIsSignedInteger;
+        
+
         
         CHECK_AURESULT(AudioUnitSetProperty(d->au,
                                           kAudioUnitProperty_StreamFormat,
-                                          is_read ? kAudioUnitScope_Input : kAudioUnitScope_Output ,
-                                          is_read ? output_bus : input_bus ,
+                                          is_read ?  kAudioUnitScope_Output : kAudioUnitScope_Input,
+                                          is_read ?  input_bus : output_bus ,
                                           &asbd,
                                           sizeof(AudioStreamBasicDescription)));
+        CHECK_AURESULT(AudioUnitGetProperty(d->au,
+                           kAudioUnitProperty_StreamFormat,
+                           is_read ? kAudioUnitScope_Output : kAudioUnitScope_Input,
+                           is_read ? input_bus : output_bus ,
+                           &asbd,
+                           &asbdsize));
+        
+        show_format(is_read ? "Input audio unit after configuration" : "Output audio unit after configuration",&asbd);
+
         
         // Get the number of frames in the IO buffer(s)
         param = sizeof(UInt32);
-        UInt32 fAudioSamples;
+        UInt32 numFrames;
         CHECK_AURESULT(AudioUnitGetProperty(d->au,
                                           kAudioDevicePropertyBufferFrameSize,
                                           kAudioUnitScope_Input,
-                                          1,
-                                          &fAudioSamples,
+                                          input_bus,
+                                          &numFrames,
                                           &param));
-        
-        result = AudioUnitInitialize(d->au);
-        if(result != noErr)
-        {
-                ms_error("failed to AudioUnitInitialize input %i", result);
-                return -1;
-        }
+        ms_message("Number of frames per buffer = %i", numFrames);
+        
         AURenderCallbackStruct cbs;
         
@@ -428 +457 @@
                                         kAudioOutputUnitProperty_SetInputCallback,
                                         kAudioUnitScope_Global,
-                                        0,
+                                        input_bus,
                                         &cbs,
                                         sizeof(AURenderCallbackStruct)));
@@ -435 +464 @@
                 CHECK_AURESULT(AudioUnitSetProperty (d->au, 
                             kAudioUnitProperty_SetRenderCallback, 
-                            kAudioUnitScope_Input, 
-                            0,
+                            kAudioUnitScope_Global, 
+                            output_bus,
                             &cbs, 
                             sizeof(AURenderCallbackStruct)));
+        }
+        result = AudioUnitInitialize(d->au);
+        if(result != noErr)
+        {
+                ms_error("failed to AudioUnitInitialize %i , is_read=%i", result,(int)is_read);
+                return -1;
         }
 
@@ -468 +503 @@
 
 static void au_common_init(AUCommon *d){
-        d->rate=8000;
+        d->rate=44100;
         d->nchannels=1;
         ms_mutex_init(&d->mutex,NULL);
@@ -545 +580 @@
 static int set_rate(MSFilter *f, void *arg){
         AUCommon *d = (AUCommon *) f->data;
-        d->rate = *((int *) arg);
-        return 0;
+        /*the hal audio unit does not accept custom rates*/
+        return (d->rate==*(int*)arg) ? 0 : -1;
 }
 
@@ -604 +639 @@
         AURead *d = (AURead *) f->data;
         d->common.dev = wc->dev;
+        d->common.rate=wc->rate;
         return f;
 }
@@ -613 +649 @@
         AUWrite *d = (AUWrite *) f->data;
         d->common.dev = wc->dev;
+        d->common.rate=wc->rate;
         return f;
 }

src/mssndcard.c

@@ -101 +101 @@
 
 void ms_snd_card_manager_add_card(MSSndCardManager *m, MSSndCard *c){
-        ms_message("Card %s added",ms_snd_card_get_string_id(c));
+        ms_message("Card '%s' added",ms_snd_card_get_string_id(c));
         m->cards=ms_list_append(m->cards,c);
 }