Add ability to retrieve capabilities for audio input devices to MediaDevicesDispatcherHost.

content/browser/renderer_host/media/media_devices_dispatcher_host.cc

Index: content/browser/renderer_host/media/media_devices_dispatcher_host.cc
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
index 05e47ec971d15763461112728dd8d81c192cfaf4..1558d27e8c09e24efe88a1094002e295ad3662dd 100644
--- a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
@@ -21,6 +21,7 @@
 #include "content/public/browser/media_device_id.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/media_stream_request.h"
+#include "media/audio/audio_system.h"
 #include "media/base/video_facing.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/service_manager/public/cpp/interface_provider.h"
@@ -85,6 +86,21 @@ MediaDeviceInfoArray TranslateMediaDeviceInfoArray(
   }
 }
 
+std::vector<::mojom::AudioInputDeviceCapabilitiesPtr>
+ToVectorAudioInputDeviceCapabilitiesPtr(
+    const std::vector<::mojom::AudioInputDeviceCapabilities>&
+        capabilities_vector) {
+  std::vector<::mojom::AudioInputDeviceCapabilitiesPtr> result;
+  result.reserve(capabilities_vector.size());
+  for (auto& capabilities : capabilities_vector) {
+    ::mojom::AudioInputDeviceCapabilitiesPtr capabilities_ptr =
+        ::mojom::AudioInputDeviceCapabilities::New();
+    *capabilities_ptr = capabilities;
+    result.push_back(std::move(capabilities_ptr));
+  }
+  return result;
+}
+
 }  // namespace
 
 struct MediaDevicesDispatcherHost::SubscriptionInfo {
@@ -118,6 +134,7 @@ MediaDevicesDispatcherHost::MediaDevicesDispatcherHost(
       group_id_salt_(BrowserContext::CreateRandomMediaDeviceIDSalt()),
       media_stream_manager_(media_stream_manager),
       permission_checker_(base::MakeUnique<MediaDevicesPermissionChecker>()),
+      num_pending_audio_input_parameters_(0),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 }
@@ -201,6 +218,29 @@ void MediaDevicesDispatcherHost::GetVideoInputCapabilities(
                  base::Passed(&client_callback)));
 }
 
+void MediaDevicesDispatcherHost::GetAudioInputCapabilities(
+    const url::Origin& security_origin,
+    GetAudioInputCapabilitiesCallback client_callback) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  if (!MediaStreamManager::IsOriginAllowed(render_process_id_,
+                                           security_origin)) {
+    bad_message::ReceivedBadMessage(render_process_id_,
+                                    bad_message::MDDH_UNAUTHORIZED_ORIGIN);
+    return;
+  }
+
+  pending_audio_input_capabilities_callbacks_.push_back(
+      std::move(client_callback));
+  if (pending_audio_input_capabilities_callbacks_.size() > 1U)
+    return;
+
+  DCHECK(current_audio_input_capabilities_.empty());
+  GetDefaultMediaDeviceID(
+      MEDIA_DEVICE_TYPE_AUDIO_INPUT, render_process_id_, render_frame_id_,
+      base::Bind(&MediaDevicesDispatcherHost::GotDefaultAudioInputDeviceID,
+                 weak_factory_.GetWeakPtr(), security_origin));
+}
+
 void MediaDevicesDispatcherHost::SubscribeDeviceChangeNotifications(
     MediaDeviceType type,
     uint32_t subscription_id,
@@ -358,8 +398,6 @@ void MediaDevicesDispatcherHost::GotDefaultVideoInputDeviceID(
     const url::Origin& security_origin,
     GetVideoInputCapabilitiesCallback client_callback,
     const std::string& default_device_id) {
-  MediaDevicesManager::BoolDeviceTypes devices_to_enumerate;
-  devices_to_enumerate[MEDIA_DEVICE_TYPE_VIDEO_INPUT] = true;
   media_stream_manager_->video_capture_manager()->EnumerateDevices(
       base::Bind(&MediaDevicesDispatcherHost::FinalizeGetVideoInputCapabilities,
                  weak_factory_.GetWeakPtr(), security_origin,
@@ -431,4 +469,83 @@ media::VideoCaptureFormats MediaDevicesDispatcherHost::GetVideoInputFormats(
   return formats;
 }
 
+void MediaDevicesDispatcherHost::GotDefaultAudioInputDeviceID(
+    const url::Origin& security_origin,
+    const std::string& default_device_id) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_GT(pending_audio_input_capabilities_callbacks_.size(), 0U);
+  DCHECK(current_audio_input_capabilities_.empty());
+  MediaDevicesManager::BoolDeviceTypes devices_to_enumerate;
+  devices_to_enumerate[MEDIA_DEVICE_TYPE_AUDIO_INPUT] = true;
+  media_stream_manager_->media_devices_manager()->EnumerateDevices(
+      devices_to_enumerate,
+      base::Bind(&MediaDevicesDispatcherHost::GotAudioInputEnumeration,
+                 weak_factory_.GetWeakPtr(), security_origin,
+                 default_device_id));
+}
+
+void MediaDevicesDispatcherHost::GotAudioInputEnumeration(
+    const url::Origin& security_origin,
+    const std::string& default_device_id,
+    const MediaDeviceEnumeration& enumeration) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_GT(pending_audio_input_capabilities_callbacks_.size(), 0U);
+  DCHECK(current_audio_input_capabilities_.empty());
+  for (const auto& device_info : enumeration[MEDIA_DEVICE_TYPE_AUDIO_INPUT]) {
+    ::mojom::AudioInputDeviceCapabilities capabilities(
+        device_info.device_id, media::AudioParameters());
+    if (device_info.device_id == default_device_id)

[tommi (sloooow) - chröme, 2017/05/08 17:52:54]

nit: {}

+      current_audio_input_capabilities_.insert(
+          current_audio_input_capabilities_.begin(), std::move(capabilities));
+    else
+      current_audio_input_capabilities_.push_back(std::move(capabilities));
+  }
+  if (current_audio_input_capabilities_.empty()) {
+    FinalizeGetAudioInputCapabilities();
+    return;
+  }
+
+  num_pending_audio_input_parameters_ =
+      current_audio_input_capabilities_.size();
+  for (size_t i = 0; i < num_pending_audio_input_parameters_; ++i) {
+    std::string raw_device_id =
+        std::move(current_audio_input_capabilities_[i].device_id);
+    current_audio_input_capabilities_[i].device_id = GetHMACForMediaDeviceID(
+        device_id_salt_, security_origin, raw_device_id);
+    media_stream_manager_->audio_system()->GetInputStreamParameters(
+        raw_device_id,
+        base::Bind(&MediaDevicesDispatcherHost::GotAudioInputParameters,
+                   weak_factory_.GetWeakPtr(), i));
+  }
+}
+
+void MediaDevicesDispatcherHost::GotAudioInputParameters(
+    size_t index,
+    const media::AudioParameters& parameters) {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_GT(pending_audio_input_capabilities_callbacks_.size(), 0U);
+  DCHECK_GT(current_audio_input_capabilities_.size(), index);
+  DCHECK_GT(num_pending_audio_input_parameters_, 0U);
+
+  current_audio_input_capabilities_[index].parameters =
+      parameters.IsValid() ? parameters
+                           : media::AudioParameters::UnavailableDeviceParams();
+  if (--num_pending_audio_input_parameters_ == 0U)
+    FinalizeGetAudioInputCapabilities();
+}
+
+void MediaDevicesDispatcherHost::FinalizeGetAudioInputCapabilities() {
+  DCHECK_CURRENTLY_ON(BrowserThread::IO);
+  DCHECK_GT(pending_audio_input_capabilities_callbacks_.size(), 0U);
+  DCHECK_EQ(0U, num_pending_audio_input_parameters_);
+
+  for (auto& callback : pending_audio_input_capabilities_callbacks_) {
+    std::move(callback).Run(ToVectorAudioInputDeviceCapabilitiesPtr(
+        current_audio_input_capabilities_));
+  }
+
+  current_audio_input_capabilities_.clear();
+  pending_audio_input_capabilities_callbacks_.clear();
+}
+
 }  // namespace content