Video Capture: extract storage info from pixel format in VideoCaptureFormat.

content/browser/renderer_host/media/video_capture_controller.cc

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 c60a99e0194e0f1b48a1cb970c486cabc650e4fc..41ccb69f1e981a0cfef4b7d440b1347ecba39129 100644
--- a/content/browser/renderer_host/media/video_capture_controller.cc
+++ b/content/browser/renderer_host/media/video_capture_controller.cc
@@ -328,7 +328,9 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
             client->controller_id, buffer_id, frame->mailbox_holder(0),
             frame->coded_size(), timestamp, copy_of_metadata.Pass());
       } else if (frame->format() == media::VideoFrame::I420) {
-        bool is_new_buffer = client->known_buffers.insert(buffer_id).second;
+        DCHECK(frame->IsMappable());
+        const bool is_new_buffer =
+            client->known_buffers.insert(buffer_id).second;
         if (is_new_buffer) {
           // On the first use of a buffer on a client, share the memory handle.
           size_t memory_size = 0;
@@ -347,7 +349,7 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
         break;
       }
 
-      bool inserted =
+      const bool inserted =
           client->active_buffers.insert(std::make_pair(buffer_id, frame))
               .second;
       DCHECK(inserted) << "Unexpected duplicate buffer: " << buffer_id;
@@ -363,10 +365,11 @@ void VideoCaptureController::DoIncomingCapturedVideoFrameOnIOThread(
     UMA_HISTOGRAM_ASPECT_RATIO("Media.VideoCapture.AspectRatio",
                                frame->visible_rect().width(),
                                frame->visible_rect().height());
-    double frame_rate;
+    double frame_rate = 0.0f;
     if (!frame->metadata()->GetDouble(media::VideoFrameMetadata::FRAME_RATE,
-                                      &frame_rate))
+                                      &frame_rate)) {
       frame_rate = video_capture_format_.frame_rate;
+    }
     UMA_HISTOGRAM_COUNTS("Media.VideoCapture.FrameRate", frame_rate);
     has_received_frames_ = true;
   }