Index: content/browser/renderer_host/media/video_capture_controller.cc |
diff --git a/content/browser/renderer_host/media/video_capture_controller.cc b/content/browser/renderer_host/media/video_capture_controller.cc |
index db89a056f264e658b43d9084de2864d0723f371d..2e848112cba607e63169e43c5b2bb42776d6b60d 100644 |
--- a/content/browser/renderer_host/media/video_capture_controller.cc |
+++ b/content/browser/renderer_host/media/video_capture_controller.cc |
@@ -371,8 +371,8 @@ void VideoCaptureController::ReturnBuffer( |
consumer_resource_utilization); |
} |
-const media::VideoCaptureFormat& VideoCaptureController::GetVideoCaptureFormat() |
- const { |
+const base::Optional<media::VideoCaptureFormat> |
+VideoCaptureController::GetVideoCaptureFormat() const { |
DCHECK_CURRENTLY_ON(BrowserThread::IO); |
return video_capture_format_; |
} |
@@ -452,7 +452,7 @@ void VideoCaptureController::OnFrameReadyInBuffer( |
media::VideoFrameMetadata metadata; |
metadata.MergeInternalValuesFrom(*frame_info->metadata); |
if (!metadata.GetDouble(VideoFrameMetadata::FRAME_RATE, &frame_rate)) { |
- frame_rate = video_capture_format_.frame_rate; |
+ frame_rate = video_capture_format_->frame_rate; |
chfremer
2017/04/10 17:24:03
Could it happen that |video_capture_format_| is no
Chandan
2017/04/11 07:45:07
Right, its safe to add a check for video_capture_f
|
} |
UMA_HISTOGRAM_COUNTS("Media.VideoCapture.FrameRate", frame_rate); |
has_received_frames_ = true; |