| 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 e1830eed9fa09a7704246e7d7ac534ed97e5d574..034dc6f2f04a9e20f31c29a935e4e0de86d6cb32 100644
|
| --- a/content/browser/renderer_host/media/video_capture_manager.cc
|
| +++ b/content/browser/renderer_host/media/video_capture_manager.cc
|
| @@ -1025,6 +1025,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);
|
| }
|
| @@ -1227,6 +1230,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) {
|
|
|