Changeset 5142 for pjproject/trunk

Timestamp:

Jul 31, 2015 8:35:34 AM (9 years ago)

Author:

nanang

Message:

Close #1872:

• Moved iOS audio session category setting to factory initialisation, with option of enabling bluetooth by default.
• Also set audio session mode to AVAudioSessionModeVoiceChat.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.m (modified) (2 diffs)

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

@@ -335 +335 @@
     }
 #endif
+
+    /* Initialize audio session category and mode */
+    {
+        AVAudioSession *sess = [AVAudioSession sharedInstance];
+        pj_bool_t err;
+
+        if ([sess respondsToSelector:@selector(setCategory:withOptions:error:)])
+        {
+            err = [sess setCategory:AVAudioSessionCategoryPlayAndRecord
+                        withOptions:AVAudioSessionCategoryOptionAllowBluetooth
+                        error:nil] != YES;
+        } else {
+            err = [sess setCategory:AVAudioSessionCategoryPlayAndRecord
+                        error:nil] != YES;
+        }
+        if (err) {
+            PJ_LOG(3, (THIS_FILE,
+                       "Warning: failed settting audio session category"));
+        }
+
+        if ([sess respondsToSelector:@selector(setMode:error:)] &&
+            [sess setMode:AVAudioSessionModeVoiceChat error:nil] != YES)
+        {
+            PJ_LOG(3, (THIS_FILE, "Warning: failed settting audio mode"));
+        }
+    }
 
     cf_instance = cf;
@@ -1237 +1263 @@
 {
     OSStatus ostatus;
+
 #if !COREAUDIO_MAC
-    /* We want to be able to open playback and recording streams */
     strm->sess = [AVAudioSession sharedInstance];
-    if ([strm->sess setCategory:AVAudioSessionCategoryPlayAndRecord
-                    error:nil] != YES)
-    {
-        PJ_LOG(4, (THIS_FILE,
-                   "Warning: cannot set the audio session category"));
-    }    
 #endif