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

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

Issue 2747573002: Image Capture: MediaStreamTrack::getCapabilities() (Closed)
Patch Set: haraken@ and reillyg@s comments Created 3 years, 9 months 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
Index: content/browser/renderer_host/media/media_stream_manager.cc
diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc
index bbe23deaf798b8d1e2dd58c6b2654c877edd721a..b1f9cd21c2fa3ba29959aa2a14a7d70711cc1420 100644
--- a/content/browser/renderer_host/media/media_stream_manager.cc
+++ b/content/browser/renderer_host/media/media_stream_manager.cc
@@ -626,8 +626,8 @@ int MediaStreamManager::VideoDeviceIdToSessionId(
for (const LabeledDeviceRequest& device_request : requests_) {
for (const StreamDeviceInfo& info : device_request.second->devices) {
- if (info.device.id == device_id) {
- DCHECK_EQ(MEDIA_DEVICE_VIDEO_CAPTURE, info.device.type);
+ if (info.device.id == device_id &&
+ info.device.type == MEDIA_DEVICE_VIDEO_CAPTURE) {
return info.session_id;
}
}

Powered by Google App Engine
This is Rietveld 408576698