Refactor VideoCaptureManager::GetDeviceFormatsInUse()

content/browser/renderer_host/media/video_capture_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/media/video_capture_controller.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 353 matching lines @@
   if (buffers_in_use_entry_iter == std::end(client->buffers_in_use)) {
     NOTREACHED();
     return;
   }
   client->buffers_in_use.erase(buffers_in_use_entry_iter);
 
   OnClientFinishedConsumingBuffer(client, buffer_id,
                                   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_;
 }
 
 void VideoCaptureController::OnNewBufferHandle(
     int buffer_id,
     std::unique_ptr<media::VideoCaptureDevice::Client::Buffer::HandleProvider>
         handle_provider) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DCHECK(FindUnretiredBufferContextFromBufferId(buffer_id) ==
@@ skipping 59 matching lines @@
                          frame_info->coded_size.width());
     UMA_HISTOGRAM_COUNTS("Media.VideoCapture.Height",
                          frame_info->coded_size.height());
     UMA_HISTOGRAM_ASPECT_RATIO("Media.VideoCapture.AspectRatio",
                                frame_info->coded_size.width(),
                                frame_info->coded_size.height());
     double frame_rate = 0.0f;
     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 not yet initialized at this
point?

[Chandan, 2017/04/11 07:45:07]

Right, its safe to add a check for video_capture_format_.

     }
     UMA_HISTOGRAM_COUNTS("Media.VideoCapture.FrameRate", frame_rate);
     has_received_frames_ = true;
   }
 }
 
 void VideoCaptureController::OnBufferRetired(int buffer_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   auto buffer_context_iter = FindUnretiredBufferContextFromBufferId(buffer_id);
@@ skipping 156 matching lines @@
     EventHandlerAction action) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   for (const auto& client : controller_clients_) {
     if (client->session_closed)
       continue;
     action.Run(client->event_handler, client->controller_id);
   }
 }
 
 }  // namespace content