Changeset 4617 for pjproject/trunk

Timestamp:

Oct 9, 2013 3:34:26 AM (11 years ago)

Author:

ming

Message:

Re #1697: Use AVAudioSession to set audio session category and activate/deactivate audio session

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia-audiodev/coreaudio_dev.m (moved) (moved from pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c) (13 diffs)
• pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj (modified) (4 diffs)

pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m

@@ -36 +36 @@
     #include <CoreAudio/CoreAudio.h>
 #else
-    #include <AudioToolbox/AudioServices.h>
+    #include <AVFoundation/AVAudioSession.h>
 
     #define AudioDeviceID unsigned
@@ -52 +52 @@
 
     /* Starting iOS SDK 7, Audio Session API is deprecated. */
-    #ifdef __IPHONE_7_0
-        #define USE_AUDIO_SESSION_API 0
-    #else
-        #define USE_AUDIO_SESSION_API 1
-    #endif
+    #define USE_AUDIO_SESSION_API 0
 #endif
 
@@ -144 +140 @@
     unsigned                     resample_buf_count;
     unsigned                     resample_buf_size;
+    
+#if !COREAUDIO_MAC
+    AVAudioSession              *sess;
+#endif
 };
 
@@ -289 +289 @@
 
         /* Set the device capabilities here */
-#if USE_AUDIO_SESSION_API != 0
         cdi->info.caps = PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY |
                          PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY |
                          PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING |
+#if USE_AUDIO_SESSION_API != 0
                          PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE |
                          PJMEDIA_AUD_DEV_CAP_OUTPUT_ROUTE |
+#endif
                          PJMEDIA_AUD_DEV_CAP_EC;
         cdi->info.routes = PJMEDIA_AUD_DEV_ROUTE_LOUDSPEAKER |
                            PJMEDIA_AUD_DEV_ROUTE_EARPIECE |
                            PJMEDIA_AUD_DEV_ROUTE_BLUETOOTH;
-#else
-        cdi->info.caps = PJMEDIA_AUD_DEV_CAP_EC;
-#endif
 
         PJ_LOG(4, (THIS_FILE, " dev_id %d: %s  (in=%d, out=%d) %dHz",
@@ -1240 +1238 @@
 {
     OSStatus ostatus;
-#if !COREAUDIO_MAC && USE_AUDIO_SESSION_API != 0
-    UInt32 audioCategory = kAudioSessionCategory_PlayAndRecord;
+#if !COREAUDIO_MAC
     /* We want to be able to open playback and recording streams */
-    ostatus = AudioSessionSetProperty(kAudioSessionProperty_AudioCategory,
-                                      sizeof(audioCategory),
-                                      &audioCategory);
-    if (ostatus != kAudioSessionNoError) {
+    strm->sess = [AVAudioSession sharedInstance];
+    if ([strm->sess setCategory:AVAudioSessionCategoryPlayAndRecord
+                    error:nil] != YES)
+    {
         PJ_LOG(4, (THIS_FILE,
-                   "Warning: cannot set the audio session category (%i)",
-                   ostatus));
+                   "Warning: cannot set the audio session category"));
     }    
 #endif
@@ -1716 +1712 @@
             }
         }
-#elif USE_AUDIO_SESSION_API != 0
-        Float32 latency, latency2;
-        UInt32 size = sizeof(Float32);
-
-        if ((AudioSessionGetProperty(
-            kAudioSessionProperty_CurrentHardwareInputLatency,
-            &size, &latency) == kAudioSessionNoError) &&
-            (AudioSessionGetProperty(
-            kAudioSessionProperty_CurrentHardwareIOBufferDuration,
-            &size, &latency2) == kAudioSessionNoError))
-        {
-            strm->param.input_latency_ms = (unsigned)
-                                           ((latency + latency2) * 1000);
+#else
+        if ([strm->sess respondsToSelector:@selector(inputLatency)]) {
+            strm->param.input_latency_ms =
+                (unsigned)(([strm->sess inputLatency] +
+                            [strm->sess IOBufferDuration]) * 1000);
             strm->param.input_latency_ms++;
-        }
+        } else
+            return PJMEDIA_EAUD_INVCAP;
 #endif
 
@@ -1764 +1753 @@
             }
         }
-#elif USE_AUDIO_SESSION_API != 0
-        Float32 latency, latency2;
-        UInt32 size = sizeof(Float32);
-
-        if ((AudioSessionGetProperty(
-            kAudioSessionProperty_CurrentHardwareOutputLatency,
-            &size, &latency) == kAudioSessionNoError) &&
-            (AudioSessionGetProperty(
-            kAudioSessionProperty_CurrentHardwareIOBufferDuration,
-            &size, &latency2) == kAudioSessionNoError))
-        {
-            strm->param.output_latency_ms = (unsigned)
-                                            ((latency + latency2) * 1000);
+#else
+        if ([strm->sess respondsToSelector:@selector(outputLatency)]) {
+            strm->param.output_latency_ms =
+            (unsigned)(([strm->sess outputLatency] +
+                        [strm->sess IOBufferDuration]) * 1000);
             strm->param.output_latency_ms++;
-        }
+        } else
+            return PJMEDIA_EAUD_INVCAP;
 #endif
         *(unsigned*)pval = (++strm->param.output_latency_ms * 2);
         return PJ_SUCCESS;
-#if COREAUDIO_MAC || USE_AUDIO_SESSION_API != 0
     } else if (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_VOLUME_SETTING &&
                (strm->param.dir & PJMEDIA_DIR_PLAYBACK))
     {
+#if COREAUDIO_MAC
         OSStatus ostatus;
         Float32 volume;
@@ -1791 +1773 @@
 
         /* Output volume setting */
-#if COREAUDIO_MAC
         ostatus = AudioUnitGetProperty (strm->io_units[1] ? strm->io_units[1] :
                                         strm->io_units[0],
@@ -1801 +1782 @@
         if (ostatus != noErr)
             return PJMEDIA_AUDIODEV_ERRNO_FROM_COREAUDIO(ostatus);
-#elif USE_AUDIO_SESSION_API != 0
-        ostatus = AudioSessionGetProperty(
-                  kAudioSessionProperty_CurrentHardwareOutputVolume,
-                  &size, &volume);
-        if (ostatus != kAudioSessionNoError) {
-            return PJMEDIA_AUDIODEV_ERRNO_FROM_COREAUDIO(ostatus);
-        }
-#endif
 
         *(unsigned*)pval = (unsigned)(volume * 100);
         return PJ_SUCCESS;
+#else
+        if ([strm->sess respondsToSelector:@selector(outputVolume)]) {
+            *(unsigned*)pval = (unsigned)([strm->sess outputVolume] * 100);
+            return PJ_SUCCESS;
+        } else
+            return PJMEDIA_EAUD_INVCAP;
 #endif
 
@@ -1933 +1912 @@
         
         return PJ_SUCCESS;
-    }
-
-#if USE_AUDIO_SESSION_API != 0
-
-    else if ((cap==PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY &&
+    } else if ((cap==PJMEDIA_AUD_DEV_CAP_INPUT_LATENCY &&
          (strm->param.dir & PJMEDIA_DIR_CAPTURE)) ||
         (cap==PJMEDIA_AUD_DEV_CAP_OUTPUT_LATENCY &&
          (strm->param.dir & PJMEDIA_DIR_PLAYBACK)))
     {
-        Float32 bufferDuration = *(unsigned *)pval;
-        OSStatus ostatus;
+        NSTimeInterval duration = *(unsigned *)pval;
         unsigned latency;
-        
+
         /* For low-latency audio streaming, you can set this value to
          * as low as 5 ms (the default is 23ms). However, lowering the
          * latency may cause a decrease in audio quality.
          */
-        bufferDuration /= 1000;
-        ostatus = AudioSessionSetProperty(
-                      kAudioSessionProperty_PreferredHardwareIOBufferDuration,
-                      sizeof(bufferDuration), &bufferDuration);
-        if (ostatus != kAudioSessionNoError) {
+        duration /= 1000;
+        if ([strm->sess setPreferredIOBufferDuration:duration error:nil]
+            != YES)
+        {
             PJ_LOG(4, (THIS_FILE,
-                       "Error: cannot set the preferred buffer duration (%i)",
-                       ostatus));
-            return PJMEDIA_AUDIODEV_ERRNO_FROM_COREAUDIO(ostatus);
+                       "Error: cannot set the preferred buffer duration"));
+            return PJMEDIA_EAUD_INVOP;
         }
         
@@ -1965 +1937 @@
         
         return PJ_SUCCESS;
-    } else if (cap==PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE &&
+    }
+
+#if USE_AUDIO_SESSION_API != 0
+
+    else if (cap==PJMEDIA_AUD_DEV_CAP_INPUT_ROUTE &&
                (strm->param.dir & PJMEDIA_DIR_CAPTURE))
     {
@@ -2026 +2002 @@
     }
 
-#if !COREAUDIO_MAC && USE_AUDIO_SESSION_API != 0
-    AudioSessionSetActive(true);
+#if !COREAUDIO_MAC
+    if ([stream->sess setActive:true error:nil] != YES) {
+        PJ_LOG(4, (THIS_FILE, "Warning: cannot activate audio session"));
+    }
 #endif
     
@@ -2084 +2062 @@
     pj_mutex_unlock(stream->cf->mutex);
 
-#if !COREAUDIO_MAC && USE_AUDIO_SESSION_API != 0
-    if (should_deactivate)
-        AudioSessionSetActive(false);
+#if !COREAUDIO_MAC
+    if (should_deactivate) {
+        if ([stream->sess setActive:false error:nil] != YES) {
+            PJ_LOG(4, (THIS_FILE, "Warning: cannot deactivate audio session"));
+        }
+    }
 #endif
 

pjproject/trunk/pjsip-apps/src/pjsua/ios/ipjsua.xcodeproj/project.pbxproj

@@ -16 +16 @@
                 3ADCCD30172E40120007BE8E /* pjsua_app_legacy.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD2B172E40120007BE8E /* pjsua_app_legacy.c */; };
                 3ADCCD31172E40120007BE8E /* pjsua_app.c in Sources */ = {isa = PBXBuildFile; fileRef = 3ADCCD2C172E40120007BE8E /* pjsua_app.c */; };
+                3ADFCCFD1803B00600B0A097 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3ADFCCFC1803B00600B0A097 /* AVFoundation.framework */; };
                 3AF0580916F050770046B835 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0580816F050770046B835 /* UIKit.framework */; };
                 3AF0580B16F050770046B835 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3AF0580A16F050770046B835 /* Foundation.framework */; };
@@ -58 +59 @@
                 3ADCCD2B172E40120007BE8E /* pjsua_app_legacy.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app_legacy.c; path = ../../pjsua_app_legacy.c; sourceTree = "<group>"; };
                 3ADCCD2C172E40120007BE8E /* pjsua_app.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pjsua_app.c; path = ../../pjsua_app.c; sourceTree = "<group>"; };
+                3ADFCCFC1803B00600B0A097 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
                 3AF0580416F050770046B835 /* ipjsua.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ipjsua.app; sourceTree = BUILT_PRODUCTS_DIR; };
                 3AF0580816F050770046B835 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
@@ -101 +103 @@
                         buildActionMask = 2147483647;
                         files = (
+                                3ADFCCFD1803B00600B0A097 /* AVFoundation.framework in Frameworks */,
                                 3A92069316F1DEA500D49F96 /* CFNetwork.framework in Frameworks */,
                                 3A92068F16F1DE7100D49F96 /* AudioToolbox.framework in Frameworks */,
@@ -164 +167 @@
                         isa = PBXGroup;
                         children = (
+                                3ADFCCFC1803B00600B0A097 /* AVFoundation.framework */,
                                 3A92069216F1DEA500D49F96 /* CFNetwork.framework */,
                                 3A92068E16F1DE7100D49F96 /* AudioToolbox.framework */,