Index: content/browser/renderer_host/media/video_capture_manager.cc |
diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc |
index 136ed07d0cec29cb1a03f34f858589898d153b95..046136052968bc83a7ab962ac341a03b807ac657 100644 |
--- a/content/browser/renderer_host/media/video_capture_manager.cc |
+++ b/content/browser/renderer_host/media/video_capture_manager.cc |
@@ -1095,6 +1095,9 @@ void VideoCaptureManager::OnDevicesInfoEnumerated( |
for (const auto& it : devices_info_cache_) { |
devices.emplace_back(it.descriptor); |
descriptors_and_formats.emplace_back(it.descriptor, it.supported_formats); |
+ } |
+ |
+ if (!descriptors_and_formats.empty()) { |
MediaInternals::GetInstance()->UpdateVideoCaptureDeviceCapabilities( |
descriptors_and_formats); |
} |
@@ -1291,6 +1294,14 @@ void VideoCaptureManager::DoTakePhoto( |
base::Unretained(device), base::Passed(&callback))); |
} |
+base::Optional<CameraCalibration> VideoCaptureManager::GetCameraCalibration( |
+ const std::string& device_id) { |
+ VideoCaptureManager::DeviceInfo* info = GetDeviceInfoById(device_id); |
+ if (!info) |
+ return base::Optional<CameraCalibration>(); |
+ return info->descriptor.camera_calibration; |
+} |
+ |
#if defined(OS_ANDROID) |
void VideoCaptureManager::OnApplicationStateChange( |
base::android::ApplicationState state) { |