Copy device IDs from advanced constraints

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 <utility>
 #include <vector>
@@ skipping 46 matching lines @@
 
 void CopyBlinkRequestToStreamControls(const blink::WebUserMediaRequest& request,
                                       StreamControls* controls) {
   if (request.isNull()) {
     return;
   }
   if (!request.audioConstraints().isNull()) {
     const blink::WebMediaTrackConstraintSet& audio_basic =
         request.audioConstraints().basic();
     CopyFirstString(audio_basic.mediaStreamSource.exact(),
-                    &(controls->audio.stream_source));
+                    &controls->audio.stream_source);
     CopyVector(audio_basic.deviceId.exact(), &(controls->audio.device_ids));
     // Optionals. They may be either in ideal or in advanced.exact.
-    // TODO(hta): Get alternatives only mentioned in advanced array.
     CopyVector(audio_basic.deviceId.ideal(),
                &controls->audio.alternate_device_ids);
-
+    for (const auto& constraint : request.audioConstraints().advanced()) {
+      CopyVector(constraint.deviceId.exact(),
+                 &controls->audio.alternate_device_ids);
+      CopyVector(constraint.deviceId.ideal(),
+                 &controls->audio.alternate_device_ids);
+    }
     if (audio_basic.hotwordEnabled.hasExact()) {
       controls->hotword_enabled = audio_basic.hotwordEnabled.exact();
     } else {
       for (const auto& audio_advanced : request.audioConstraints().advanced()) {
         if (audio_advanced.hotwordEnabled.hasExact()) {
           controls->hotword_enabled = audio_advanced.hotwordEnabled.exact();
           break;
         }
       }
     }
   }
   if (!request.videoConstraints().isNull()) {
     const blink::WebMediaTrackConstraintSet& video_basic =
         request.videoConstraints().basic();
     CopyFirstString(video_basic.mediaStreamSource.exact(),
                     &(controls->video.stream_source));
     CopyVector(video_basic.deviceId.exact(), &(controls->video.device_ids));
     CopyVector(video_basic.deviceId.ideal(),
                &(controls->video.alternate_device_ids));
+    for (const auto& constraint : request.videoConstraints().advanced()) {
+      CopyVector(constraint.deviceId.exact(),
+                 &controls->video.alternate_device_ids);
+      CopyVector(constraint.deviceId.ideal(),
+                 &controls->video.alternate_device_ids);
+    }
   }
 }
 
 static int g_next_request_id  = 0;
 
 }  // namespace
 
 struct UserMediaClientImpl::MediaDevicesRequestInfo {
   MediaDevicesRequestInfo(const blink::WebMediaDevicesRequest& request,
                           int audio_input_request_id,
@@ skipping 1032 matching lines @@
       return;
     }
   }
 }
 
 bool UserMediaClientImpl::UserMediaRequestInfo::HasPendingSources() const {
   return !sources_waiting_for_callback_.empty();
 }
 
 }  // namespace content