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

media/capture/thread_safe_capture_oracle.cc

Index: media/capture/thread_safe_capture_oracle.cc
diff --git a/media/capture/thread_safe_capture_oracle.cc b/media/capture/thread_safe_capture_oracle.cc
index 5de1b3b6173eeac946b28f636ed27094b32c9efd..040e3940c2e9d19d98a72e04fc1caa5653c3e60d 100644
--- a/media/capture/thread_safe_capture_oracle.cc
+++ b/media/capture/thread_safe_capture_oracle.cc
@@ -52,9 +52,13 @@ bool ThreadSafeCaptureOracle::ObserveEventAndDecideCapture(
   const gfx::Size coded_size((visible_size.width() + 15) & ~15,
                              (visible_size.height() + 15) & ~15);
 
-  scoped_ptr<VideoCaptureDevice::Client::Buffer> output_buffer(
-      client_->ReserveOutputBuffer(params_.requested_format.pixel_format,
-                                   coded_size));
+  scoped_ptr<media::VideoCaptureDevice::Client::Buffer> output_buffer(
+      client_->ReserveOutputBuffer(coded_size,
+                                   (params_.requested_format.pixel_storage !=
+                                    media::PIXEL_STORAGE_TEXTURE)
+                                       ? media::PIXEL_FORMAT_I420
+                                       : media::PIXEL_FORMAT_ARGB,
+                                   params_.requested_format.pixel_storage));
   // TODO(miu): Use current buffer pool utilization to drive automatic video
   // resolution changes.  http://crbug.com/156767.
   VLOG(2) << "Current buffer pool utilization is "
@@ -98,9 +102,9 @@ bool ThreadSafeCaptureOracle::ObserveEventAndDecideCapture(
   TRACE_EVENT_ASYNC_BEGIN2("gpu.capture", "Capture", output_buffer.get(),
                            "frame_number", frame_number,
                            "trigger", event_name);
-  // NATIVE_TEXTURE frames wrap a texture mailbox, which we don't have at the
-  // moment.  We do not construct those frames.
-  if (params_.requested_format.pixel_format != PIXEL_FORMAT_TEXTURE) {
+  // Texture frames wrap a texture mailbox, which we don't have at the moment.
+  // We do not construct those frames.
+  if (params_.requested_format.pixel_storage != media::PIXEL_STORAGE_TEXTURE) {
     *storage = VideoFrame::WrapExternalData(
         VideoFrame::I420,
         coded_size,