Changeset 3404

Timestamp:

Jan 13, 2011 4:42:21 PM (14 years ago)

Author:

ming

Message:

Fix #1195: assertion during thread registration in coreaudio and portaudio's input/output callbacks on Mac OS X and #1196: using system's default audio input/output device instead of first available device.

Location:

pjproject/trunk/pjmedia/src/pjmedia-audiodev

Files:

• coreaudio_dev.c (modified) (4 diffs)
• pa_dev.c (modified) (2 diffs)

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

@@ -418 +418 @@
         return PJMEDIA_EAUD_INIT;
     }
+    
+    if (dev_size > 1) {
+        AudioDeviceID dev_id = kAudioObjectUnknown;
+        unsigned idx = 0;
+        
+        /* Find default audio input device */
+        addr.mSelector = kAudioHardwarePropertyDefaultInputDevice;
+        addr.mScope = kAudioObjectPropertyScopeGlobal;
+        addr.mElement = kAudioObjectPropertyElementMaster;
+        size = sizeof(dev_id);
+        
+        ostatus = AudioObjectGetPropertyData(kAudioObjectSystemObject,
+                                             &addr, 0, NULL,
+                                             &size, (void *)&dev_id);
+        if (ostatus != noErr && dev_id != dev_ids[idx]) {
+            AudioDeviceID temp_id = dev_ids[idx];
+            
+            for (i = idx + 1; i < dev_size; i++) {
+                if (dev_ids[i] == dev_id) {
+                    dev_ids[idx++] = dev_id;
+                    dev_ids[i] = temp_id;
+                    break;
+                }
+            }
+        }
+
+        /* Find default audio output device */
+        addr.mSelector = kAudioHardwarePropertyDefaultOutputDevice;     
+        ostatus = AudioObjectGetPropertyData(kAudioObjectSystemObject,
+                                             &addr, 0, NULL,
+                                             &size, (void *)&dev_id);
+        if (ostatus != noErr && dev_id != dev_ids[idx]) {
+            AudioDeviceID temp_id = dev_ids[idx];
+            
+            for (i = idx + 1; i < dev_size; i++) {
+                if (dev_ids[i] == dev_id) {
+                    dev_ids[idx] = dev_id;
+                    dev_ids[i] = temp_id;
+                    break;
+                }
+            }
+        }
+    }
 
     /* Build the devices' info */
@@ -650 +693 @@
     if (strm->rec_thread_initialized == 0 || !pj_thread_is_registered())
     {
+        pj_bzero(strm->rec_thread_desc, sizeof(pj_thread_desc));
         status = pj_thread_register("ca_rec", strm->rec_thread_desc,
                                     &strm->rec_thread);
@@ -790 +834 @@
     if (strm->rec_thread_initialized == 0 || !pj_thread_is_registered())
     {
+        pj_bzero(strm->rec_thread_desc, sizeof(pj_thread_desc));
         status = pj_thread_register("ca_rec", strm->rec_thread_desc,
                                     &strm->rec_thread);
@@ -905 +950 @@
     if (stream->play_thread_initialized == 0 || !pj_thread_is_registered())
     {
+        pj_bzero(stream->play_thread_desc, sizeof(pj_thread_desc));
         status = pj_thread_register("coreaudio", stream->play_thread_desc,
                                     &stream->play_thread);

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

@@ -186 +186 @@
     if (stream->rec_thread_initialized == 0 || !pj_thread_is_registered()) 
     {
+        pj_bzero(stream->rec_thread_desc, sizeof(pj_thread_desc));
         status = pj_thread_register("pa_rec", stream->rec_thread_desc, 
                                     &stream->rec_thread);
@@ -298 +299 @@
     if (stream->play_thread_initialized == 0 || !pj_thread_is_registered()) 
     {
+        pj_bzero(stream->play_thread_desc, sizeof(pj_thread_desc));
         status = pj_thread_register("portaudio", stream->play_thread_desc,
                                     &stream->play_thread);