Changeset 3454

Timestamp:

Mar 16, 2011 5:44:14 AM (13 years ago)

Author:

ming

Message:

Re #1175 (Misc): coreaudio fixes:

• Setting audio session category is now during stream creation instead of in the factory initialization.
• Reset the audio session category after an interruption.
• By default, audio route change property listener is disabled as it is no longer required.

File:

• pjproject/trunk/pjmedia/src/pjmedia-audiodev/coreaudio_dev.c (modified) (10 diffs)

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

@@ -37 +37 @@
 
     #define AudioDeviceID unsigned
+
+    /**
+     * As in iOS SDK 4 or later, audio route change property listener is
+     * no longer necessary. Just make surethat your application can receive
+     * remote control events by adding the code:
+     *     [[UIApplication sharedApplication] 
+     *      beginReceivingRemoteControlEvents];
+     * Otherwise audio route change (such as headset plug/unplug) will not be
+     * processed while your application is in the background mode.
+     */
+    #define USE_AUDIO_ROUTE_CHANGE_PROP_LISTENER 0
+
 #endif
 
@@ -224 +236 @@
     unsigned i;
     OSStatus ostatus;
-    UInt32 audioCategory;
 #endif
 
@@ -297 +308 @@
     }
 
-    /* We want to be able to open playback and recording streams */
-    audioCategory = kAudioSessionCategory_PlayAndRecord;
-    ostatus = AudioSessionSetProperty(kAudioSessionProperty_AudioCategory,
-                                      sizeof(audioCategory),
-                                      &audioCategory);
-    if (ostatus != kAudioSessionNoError) {
-        PJ_LOG(4, (THIS_FILE,
-                   "Warning: cannot set the audio session category (%i)",
-                   ostatus));
-    }
-
-    /* Listen for audio routing change notifications */
+    /* Listen for audio routing change notifications. */
+#if USE_AUDIO_ROUTE_CHANGE_PROP_LISTENER != 0
     ostatus = AudioSessionAddPropertyListener(
                   kAudioSessionProperty_AudioRouteChange,
@@ -317 +318 @@
                    "notifications (%i)", ostatus));
     }
-    
+#endif
+
     cf_instance = cf;
 #endif
@@ -337 +339 @@
 
 #if !COREAUDIO_MAC
+#if USE_AUDIO_ROUTE_CHANGE_PROP_LISTENER != 0
     AudioSessionRemovePropertyListenerWithUserData(
         kAudioSessionProperty_AudioRouteChange, propListener, cf);
+#endif
 #endif
     
@@ -1089 +1093 @@
             continue;
 
-        /* This does not seem necessary anymore. Just make sure 
-         * that your application can receive remote control
-         * events by adding the code:
-         *     [[UIApplication sharedApplication] 
-         *      beginReceivingRemoteControlEvents];
-         * Otherwise audio route change (such as headset plug/unplug)
-         * will not be processed while your application is in the 
-         * background mode.
-         */
         /*
         status = ca_stream_stop((pjmedia_aud_stream *)it->stream);
@@ -1131 +1126 @@
             it->stream->interrupted == PJ_TRUE)
         {
+            UInt32 audioCategory;
+            OSStatus ostatus;
+
             /* Make sure that your application can receive remote control
              * events by adding the code:
@@ -1138 +1136 @@
              * application is in the background mode.
              */
+            /* Make sure we set the correct audio category before restarting */
+            audioCategory = kAudioSessionCategory_PlayAndRecord;
+            ostatus = AudioSessionSetProperty(kAudioSessionProperty_AudioCategory,
+                                              sizeof(audioCategory),
+                                              &audioCategory);
+            if (ostatus != kAudioSessionNoError) {
+                PJ_LOG(4, (THIS_FILE,
+                           "Warning: cannot set the audio session category (%i)",
+                           ostatus));
+            }
+            
+            /* Restart the stream */
             status = ca_stream_start((pjmedia_aud_stream*)it->stream);
             if (status != PJ_SUCCESS) {
@@ -1202 +1212 @@
 {
     OSStatus ostatus;
-
+#if !COREAUDIO_MAC
+    UInt32 audioCategory = kAudioSessionCategory_PlayAndRecord;
+    /* We want to be able to open playback and recording streams */
+    ostatus = AudioSessionSetProperty(kAudioSessionProperty_AudioCategory,
+                                      sizeof(audioCategory),
+                                      &audioCategory);
+    if (ostatus != kAudioSessionNoError) {
+        PJ_LOG(4, (THIS_FILE,
+                   "Warning: cannot set the audio session category (%i)",
+                   ostatus));
+    }    
+#endif
+    
     /* Create an audio unit to interface with the device */
     ostatus = AudioComponentInstanceNew(io_comp, io_unit);
@@ -1434 +1456 @@
         strm->audio_buf->mBuffers[0].mNumberChannels =
                 strm->streamFormat.mChannelsPerFrame;
+        
 #endif