Merge lp:~abreu-alexandre/oxide/add-device-id-constraint-support-getusermedia into lp:~oxide-developers/oxide/oxide.trunk

[Alexandre Abreu]

Add support for device id constraint support

Add support for device id constraint support

[Chris Coulson (chrisccoulson)]

Thanks, I've added some comments inline

review: Needs Fixing

[Alexandre Abreu (abreu-alexandre)]

Updated

[Alexandre Abreu (abreu-alexandre)]

(and replied to your comment)

[Chris Coulson (chrisccoulson)]

I've added another reply

review: Needs Fixing

[lp:~abreu-alexandre/oxide/add-device-id-constraint-support-getusermedia]

1447. By Alexandre Abreu on 2016-04-19

Remove requestVideo/Aufio id properties to media request

1448. By Alexandre Abreu on 2016-04-19

nits

[Alexandre Abreu (abreu-alexandre)]

Updated

[Chris Coulson (chrisccoulson)]

review: Approve

=== modified file 'shared/browser/media/oxide_media_capture_devices_dispatcher.cc'
--- shared/browser/media/oxide_media_capture_devices_dispatcher.cc	2015-09-14 21:35:00 +0000
+++ shared/browser/media/oxide_media_capture_devices_dispatcher.cc	2016-04-19 17:38:58 +0000
@@ -74,6 +74,8 @@
     content::RenderFrameHost* render_frame_host,
     bool audio,
     bool video,
+    const std::string& requested_audio_device_id,
+    const std::string& requested_video_device_id,
     PermissionRequestResponse response) {
   if (response != PERMISSION_REQUEST_RESPONSE_ALLOW) {
     callback.Run(content::MediaStreamDevices(),
@@ -86,11 +88,33 @@
       render_frame_host->GetProcess()->GetBrowserContext();
 
   content::MediaStreamDevices devices;
-  MediaCaptureDevicesDispatcher::GetInstance()
-      ->GetDefaultCaptureDevicesForContext(context,
-                                           audio,
-                                           video,
-                                           &devices);
+  if (audio && !requested_audio_device_id.empty()) {
+    const content::MediaStreamDevice* device =
+        MediaCaptureDevicesDispatcher::GetInstance()->
+            FindAudioCaptureDeviceById(requested_audio_device_id);
+    if (device) {
+      devices.push_back(*device);
+      audio = false;
+    }
+  }
+
+  if (video && !requested_video_device_id.empty()) {
+    const content::MediaStreamDevice* device =
+        MediaCaptureDevicesDispatcher::GetInstance()->
+            FindVideoCaptureDeviceById(requested_video_device_id);
+    if (device) {
+      devices.push_back(*device);
+      video = false;
+    }
+  }
+
+  if (audio || video) {
+      MediaCaptureDevicesDispatcher::GetInstance()
+          ->GetDefaultCaptureDevicesForContext(context,
+                                               audio,
+                                               video,
+                                               &devices);
+  }
 
   callback.Run(devices,
                devices.empty() ?
@@ -105,6 +129,8 @@
     int render_frame_id,
     bool audio,
     bool video,
+    const std::string& requested_audio_device_id,
+    const std::string& requested_video_device_id,
     const GURL& requesting_origin,
     const GURL& embedding_origin,
     PermissionRequestResponse response) {
@@ -121,6 +147,8 @@
                                         rfh,
                                         audio,
                                         video,
+                                        requested_audio_device_id,
+                                        requested_video_device_id,
                                         response);
 
   if (response == PERMISSION_REQUEST_RESPONSE_CANCEL) {
@@ -153,6 +181,8 @@
     int render_frame_id,
     bool audio,
     bool video,
+    const std::string& requested_audio_device_id,
+    const std::string& requested_video_device_id,
     const GURL& requesting_origin,
     const GURL& embedding_origin) {
   return base::Bind(&RespondToMediaAccessPermissionRequestCallback,
@@ -161,6 +191,8 @@
                     render_frame_id,
                     audio,
                     video,
+                    requested_audio_device_id,
+                    requested_video_device_id,
                     requesting_origin,
                     embedding_origin);
 }
@@ -430,6 +462,8 @@
         rfh,
         audio,
         video,
+        request.requested_audio_device_id,
+        request.requested_video_device_id,
         ToPermissionRequestResponse(saved_status));
     return;
   }
@@ -445,6 +479,8 @@
                                   request.render_frame_id,
                                   audio,
                                   video,
+                                  request.requested_audio_device_id,
+                                  request.requested_video_device_id,
                                   request.security_origin,
                                   embedding_origin));
 }