Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Unified Diff: content/browser/renderer_host/media/media_stream_device_settings.cc

Issue 8695004: Let fake UI allow a video capture device to be opened several times. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Changes based on review by scherkus. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/media_stream_device_settings.cc
diff --git a/content/browser/renderer_host/media/media_stream_device_settings.cc b/content/browser/renderer_host/media/media_stream_device_settings.cc
index 85c634ed0d7d9489f5aaf7cacee8748f56ef7390..b1eb952657d4b539ece3761a36d8ab97f9be49d0 100644
--- a/content/browser/renderer_host/media/media_stream_device_settings.cc
+++ b/content/browser/renderer_host/media/media_stream_device_settings.cc
@@ -124,6 +124,16 @@ void MediaStreamDeviceSettings::AvailableDevices(
}
}
}
+ if (num_media_requests != devices_to_use.size()) {
+ // Not all requested device types were opened. This happens if all
+ // video capture devices are already opened, |in_use| isn't set for
+ // audio devices. Allow the first video capture device in the list to be
+ // opened for this user too.
+ DCHECK_NE(request->options.video_option, StreamOptions::kNoCamera);
+ StreamDeviceInfoArray device_array = (request->devices[kVideoCapture]);
+ devices_to_use.push_back(*(device_array.begin()));
+ }
+
// Post result and delete request.
requester_->DevicesAccepted(label, devices_to_use);
requests_.erase(request_it);
« no previous file with comments | « no previous file | content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698