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

media/capture/thread_safe_capture_oracle.cc

 // Copyright 2014 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 "media/capture/thread_safe_capture_oracle.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 34 matching lines @@
 
   if (!client_)
     return false;  // Capture is stopped.
 
   const gfx::Size visible_size = resolution_chooser_.capture_size();
   // Always round up the coded size to multiple of 16 pixels.
   // See http://crbug.com/402151.
   const gfx::Size coded_size((visible_size.width() + 15) & ~15,
                              (visible_size.height() + 15) & ~15);
 
-  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));
+  scoped_ptr<VideoCaptureDevice::Client::Buffer> output_buffer(
+      client_->ReserveOutputBuffer(params_.requested_format.pixel_format,
+                                   coded_size));
   // TODO(miu): Use current buffer pool utilization to drive automatic video
   // resolution changes.  http://crbug.com/156767.
   VLOG(2) << "Current buffer pool utilization is "
           << (client_->GetBufferPoolUtilization() * 100.0) << '%';
 
   const bool should_capture =
       oracle_.ObserveEventAndDecideCapture(event, damage_rect, event_time);
 
   const char* event_name =
       (event == VideoCaptureOracle::kTimerPoll ? "poll" :
@@ skipping 23 matching lines @@
     // to because no output buffer was available.
     TRACE_EVENT_INSTANT1("gpu.capture", "NearlyPipelineLimited",
                          TRACE_EVENT_SCOPE_THREAD,
                          "trigger", event_name);
     return false;
   }
   int frame_number = oracle_.RecordCapture();
   TRACE_EVENT_ASYNC_BEGIN2("gpu.capture", "Capture", output_buffer.get(),
                            "frame_number", frame_number,
                            "trigger", event_name);
-  // 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) {
+  // 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) {
     *storage = VideoFrame::WrapExternalData(
         VideoFrame::I420,
         coded_size,
         gfx::Rect(visible_size),
         visible_size,
         static_cast<uint8*>(output_buffer->data()),
         output_buffer->size(),
         base::TimeDelta());
     DCHECK(*storage);
   }
@@ skipping 80 matching lines @@
       utilization >= 0.0) {
     VLOG(2) << "Consumer resource utilization for frame " << frame_number
             << ": " << utilization;
   }
 
   // TODO(miu): Use |utilization| to drive automatic video resolution changes.
   // http://crbug.com/156767.
 }
 
 }  // namespace media