Audio device selection for external Audio Device Module componenet

Author: Vladimir Morosev

idl/WebRtcFactory.idl

@@ -108,6 +108,16 @@ namespace org
       /// Gets or sets if audio rendering is enabled.
       /// </summary>
       bool audioRenderingEnabled = true;
+	  
+      /// <summary>
+      /// Gets or sets Device ID of used audio capture device.
+      /// </summary>
+	  string audioCaptureDeviceId;
+	  
+      /// <summary>
+      /// Gets or sets Device ID of used audio render device.
+      /// </summary>
+	  string audioRenderDeviceId;
 
       /// <summary>
       /// Gets or sets if audio post-capture and pre-render events should be

windows/wrapper/impl_org_webRtc_WebRtcFactory.cpp

@@ -326,6 +326,8 @@ void WrapperImplType::setup() noexcept
 
   bool audioCapturingEnabled = configuration_ ? configuration_->audioCapturingEnabled : true;
   bool audioRenderingEnabled = configuration_ ? configuration_->audioRenderingEnabled : true;
+  String audioCaptureDeviceId = configuration_ ? configuration_->audioCaptureDeviceId : String();
+  String audioRenderDeviceId = configuration_ ? configuration_->audioRenderDeviceId : String();
   bool enableAudioProcessingEvents = configuration_ ? configuration_->enableAudioBufferEvents : false;
 
   networkThread = rtc::Thread::CreateWithSocketServer();
@@ -351,6 +353,38 @@ void WrapperImplType::setup() noexcept
     return rtc::scoped_refptr<::webrtc::AudioDeviceModule>(webrtc::IAudioDeviceWasapi::create(props));
   });
 
+  if (audioCaptureDeviceId.size() != 0) {
+    int deviceCount = audioDeviceModule->RecordingDevices();
+    char deviceName[256];
+    char deviceId[256];
+    uint16_t deviceIndex = USHRT_MAX;
+    for (uint16_t i = 0; i < deviceCount; i++) {
+      audioDeviceModule->RecordingDeviceName(i, deviceName, deviceId);
+      if (strcmp(audioCaptureDeviceId.c_str(), deviceId) == 0) {
+        deviceIndex = i;
+        break;
+      }
+    }
+    if (deviceIndex != USHRT_MAX)
+      audioDeviceModule->SetRecordingDevice(deviceIndex);
+  }
+
+  if (audioRenderDeviceId.size() != 0) {
+    int deviceCount = audioDeviceModule->PlayoutDevices();
+    char deviceName[256];
+    char deviceId[256];
+    uint16_t deviceIndex = USHRT_MAX;
+    for (uint16_t i = 0; i < deviceCount; i++) {
+      audioDeviceModule->PlayoutDeviceName(i, deviceName, deviceId);
+      if (strcmp(audioRenderDeviceId.c_str(), deviceId) == 0) {
+        deviceIndex = i;
+        break;
+      }
+    }
+    if (deviceIndex != USHRT_MAX)
+      audioDeviceModule->SetPlayoutDevice(deviceIndex);
+  }
+
   rtc::scoped_refptr<::webrtc::AudioProcessing> audioProcessing;
   if (enableAudioProcessingEvents)
     audioProcessing = rtc::scoped_refptr<::webrtc::AudioProcessing>{::webrtc::AudioProcessingBuilder().SetCapturePostProcessing(std::move(audioPostCaptureInit_)).SetRenderPreProcessing(std::move(audioPreRenderInit_)).Create() };

windows/wrapper/impl_org_webRtc_WebRtcFactoryConfiguration.cpp

@@ -61,6 +61,8 @@ WrapperImplTypePtr WrapperImplType::clone(WrapperTypePtr wrapper) noexcept
   auto result = std::make_shared<WrapperImplType>();
   result->audioCapturingEnabled = converted->audioCapturingEnabled;
   result->audioRenderingEnabled = converted->audioRenderingEnabled;
+  result->audioCaptureDeviceId = converted->audioCaptureDeviceId;
+  result->audioRenderDeviceId = converted->audioRenderDeviceId;
   result->enableAudioBufferEvents = converted->enableAudioBufferEvents;
   return result;
 }

windows/wrapper/impl_webrtc_AudioDeviceWasapi.cpp

@@ -1865,21 +1865,13 @@ namespace webrtc
     // Refresh the list of rendering endpoint devices
     RefreshDeviceList(DeviceClass::AudioRender);
 
-    if (initialized_) {
-      return (DeviceListCount(DeviceClass::AudioRender));
-    }
-
-    return -1;
+    return (DeviceListCount(DeviceClass::AudioRender));
   }
 
   // ----------------------------------------------------------------------------
   //  SetPlayoutDevice I (II)
   // ----------------------------------------------------------------------------
   int32_t AudioDeviceWasapi::SetPlayoutDevice(uint16_t index) {
-    if (playIsInitialized_) {
-      return -1;
-    }
-
     if (!playoutEnabled_) {
       return 0;
     }
@@ -1922,11 +1914,13 @@ namespace webrtc
   // ----------------------------------------------------------------------------
   int32_t AudioDeviceWasapi::SetPlayoutDevice(
     AudioDeviceModule::WindowsDeviceType device) {
-    if (playIsInitialized_) {
-      return -1;
+    if (!playoutEnabled_) {
+      return 0;
     }
 
-    if (!playoutEnabled_) {
+    // If device has been selected once by index value it couldn't be changed afterwards
+    // by setting the device type
+    if (usingOutputDeviceIndex_) {
       return 0;
     }
 
@@ -1955,8 +1949,6 @@ namespace webrtc
         str.c_str());
     }
 
-    usingOutputDeviceIndex_ = false;
-
     return 0;
   }
 
@@ -2120,21 +2112,13 @@ namespace webrtc
     // Refresh the list of capture endpoint devices
     RefreshDeviceList(DeviceClass::AudioCapture);
 
-    if (initialized_) {
-      return (DeviceListCount(DeviceClass::AudioCapture));
-    }
-
-    return -1;
+    return (DeviceListCount(DeviceClass::AudioCapture));
   }
 
   // ----------------------------------------------------------------------------
   //  SetRecordingDevice I (II)
   // ----------------------------------------------------------------------------
   int32_t AudioDeviceWasapi::SetRecordingDevice(uint16_t index) {
-    if (recIsInitialized_) {
-        return -1;
-    }
-
     if (!recordingEnabled_) {
       return 0;
     }
@@ -2178,11 +2162,13 @@ namespace webrtc
   // ----------------------------------------------------------------------------
   int32_t AudioDeviceWasapi::SetRecordingDevice(
     AudioDeviceModule::WindowsDeviceType device) {
-    if (recIsInitialized_) {
-        return -1;
+    if (!recordingEnabled_) {
+      return 0;
     }
 
-    if (!recordingEnabled_) {
+    // If device has been selected once by index value it couldn't be changed
+    // afterwards by setting the device type
+    if (usingInputDeviceIndex_) {
       return 0;
     }
 
@@ -2212,8 +2198,6 @@ namespace webrtc
         GetDeviceName(captureDevice_));
     }
 
-    usingInputDeviceIndex_ = false;
-
     return 0;
   }