Reland of Initialize default audio device ID with explicit device ID.

content/renderer/media/user_media_client_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/user_media_client_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 13 matching lines @@
 #include "content/renderer/media/media_stream_constraints_util_video_content.h"
 #include "content/renderer/media/media_stream_constraints_util_video_device.h"
 #include "content/renderer/media/media_stream_dispatcher.h"
 #include "content/renderer/media/media_stream_video_capturer_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/peer_connection_tracker.h"
 #include "content/renderer/media/webrtc/processed_local_audio_source.h"
 #include "content/renderer/media/webrtc_logging.h"
 #include "content/renderer/media/webrtc_uma_histograms.h"
 #include "content/renderer/render_thread_impl.h"
+#include "media/audio/audio_device_description.h"
 #include "media/capture/video_capture_types.h"
 #include "third_party/WebKit/public/platform/WebMediaConstraints.h"
 #include "third_party/WebKit/public/platform/WebMediaDeviceInfo.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
 
 namespace content {
@@ skipping 34 matching lines @@
 // advanced constraint in |constraints| is found in |device_infos|, the first
 // such device ID is copied to |*device_id| and the function returns true.
 // If no such device ID is found, |*device_id| is left unmodified and the
 // function returns true.
 // TODO(guidou): Replace with a spec-compliant selection algorithm. See
 // http://crbug.com/657733.
 bool PickDeviceId(const blink::WebMediaConstraints& constraints,
                   const MediaDeviceInfoArray& device_infos,
                   std::string* device_id) {
   DCHECK(!constraints.IsNull());
-  DCHECK(device_id->empty());
+  DCHECK(media::AudioDeviceDescription::IsDefaultDevice(*device_id));
 
   if (constraints.Basic().device_id.Exact().size() > 1) {
     LOG(ERROR) << "Only one required device ID is supported";
     return false;
   }
 
   if (constraints.Basic().device_id.Exact().size() == 1 &&
       !FindDeviceId(constraints.Basic().device_id.Exact(), device_infos,
                     device_id)) {
     LOG(ERROR) << "Invalid mandatory device ID = "
@@ skipping 292 matching lines @@
 
   // TODO(guidou): Request audio and video capabilities in parallel.
   if (current_request_info_->request().Audio()) {
     bool request_audio_input_devices = false;
     // TODO(guidou): Implement spec-compliant device selection for audio. See
     // http://crbug.com/623104.
     CopyConstraintsToTrackControls(
         current_request_info_->request().AudioConstraints(),
         &current_request_info_->stream_controls()->audio,
         &request_audio_input_devices);
+    // Explicitly initialize the requested device ID to the default.
+    if (IsDeviceSource(
+            current_request_info_->stream_controls()->audio.stream_source)) {
+      current_request_info_->stream_controls()->audio.device_id =
+          std::string(media::AudioDeviceDescription::kDefaultDeviceId);
+    }
     CopyHotwordAndLocalEchoToStreamControls(
         current_request_info_->request().AudioConstraints(),
         current_request_info_->stream_controls());
     // Check if this input device should be used to select a matching output
     // device for audio rendering.
     bool enable_automatic_output_device_selection = false;
     GetConstraintValueAsBoolean(
         current_request_info_->request().AudioConstraints(),
         &blink::WebMediaTrackConstraintSet::render_to_associated_sink,
         &enable_automatic_output_device_selection);
@@ skipping 979 matching lines @@
     const blink::WebString& result_name) {
   // Check if we're waiting to be notified of this source.  If not, then we'll
   // ignore the notification.
   auto found = std::find(sources_waiting_for_callback_.begin(),
                          sources_waiting_for_callback_.end(), source);
   if (found != sources_waiting_for_callback_.end())
     OnTrackStarted(source, result, result_name);
 }
 
 }  // namespace content