Changeset 1320:dab6ed12490e in mediastreamer2

Timestamp:

Mar 21, 2011 11:01:34 PM (2 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

committer:

Simon Morlat <simon.morlat@linphone.org> 1300745005 -3600

Message:

start porting audio unit filter to mac

File:

• src/msiounit.c (modified) (10 diffs)

src/msiounit.c

@@ -129 +129 @@
 #define check_auresult(au,method) \
 if (au!=0) ms_error("AudioUnit error for %s: ret=%i",method,au)
+
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+
 static void au_interuption_listener(void* inClientData, UInt32 inInterruptionState) {
         if (((MSSndCard*)inClientData)->data == NULL) return;
@@ -154 +157 @@
 }
 
+#endif
+
 static MSSndCard *au_card_new(const char* name){
         MSSndCard *card=ms_snd_card_new_with_name(&au_card_desc,name);
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
         OSStatus auresult = AudioSessionInitialize(NULL, NULL, au_interuption_listener, card);
         if (auresult != kAudioSessionAlreadyInitialized) {
                 check_auresult(auresult,"AudioSessionInitialize");
         }
+#endif
         return card;
 }
 
 static void au_detect(MSSndCardManager *m){
+        MSSndCard *card;
         ms_debug("au_detect");
-        MSSndCard *card=au_card_new(AU_CARD_RECEIVER);
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
+        card=au_card_new(AU_CARD_RECEIVER);
         ms_snd_card_manager_add_card(m,card);
         card=au_card_new(AU_CARD_SPEAKER);
-        ms_snd_card_manager_add_card(m,card);   
+        
+#else
+        card=au_card_new("Audio Unit");
+#endif  
+        ms_snd_card_manager_add_card(m,card);
 }
 
@@ -264 +277 @@
         
         
-        
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
         auresult = AudioSessionSetActive(true);
         check_auresult(auresult,"AudioSessionSetActive");
@@ -281 +294 @@
                 ms_message("Configuring audio session default route to receiver");
         }
+#endif
+
         if (d->started == TRUE) {
                 //nothing else to do
@@ -287 +302 @@
         
         au_description.componentType          = kAudioUnitType_Output;
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
         au_description.componentSubType       = kAudioUnitSubType_VoiceProcessingIO;
+#else
+        au_description.componentSubType       =  kAudioUnitSubType_HALOutput;
+#endif
         au_description.componentManufacturer  = kAudioUnitManufacturer_Apple;
         au_description.componentFlags         = 0;
@@ -383 +402 @@
         check_auresult(auresult,"kAudioUnitProperty_SetRenderCallback,kAudioUnitScope_Input");
         
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
         const Float64 preferredSampleRate = d->rate;//PREFERRED_HW_SAMPLE_RATE; /*optimum to minimize delay, must put a software resampler to deal with 8khz*/
         
@@ -407 +427 @@
         
         if (auresult != 0) ms_message("kAudioSessionProperty_PreferredHardwareIOBufferDuration returns %i ",auresult);
+#endif
         
         Float64 delay;
@@ -429 +450 @@
         
         ms_message("I/O unit latency [%f], quality [%i]",delay,quality);
+
+#ifdef __IPHONE_OS_VERSION_MIN_REQUIRED
         Float32 hwoutputlatency;
         UInt32 hwoutputlatencySize=sizeof(hwoutputlatency);
@@ -453 +476 @@
 
         ms_message("current hw output latency [%f] input [%f] iobuf[%f] sample rate [%f]",hwoutputlatency,hwinputlatency,hwiobuf,hwsamplerate);
+#else
+
+        auresult=AudioUnitInitialize(d->io_unit);
+        check_auresult(auresult,"AudioUnitInitialize");
+#endif
         auresult=AudioOutputUnitStart(d->io_unit);
         check_auresult(auresult,"AudioOutputUnitStart");
@@ -667 +695 @@
          */
         ms_snd_card_manager_register_desc(ms_snd_card_manager_get(),&au_card_desc);
-}       
+}
+