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

content/browser/renderer_host/media/video_capture_buffer_pool.cc

Index: content/browser/renderer_host/media/video_capture_buffer_pool.cc
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.cc b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
index abf05254accfd7efa28894ee4b269b0766e65b53..23a63730fd9498c306e1296b1299e132f2ad26b0 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.cc
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.cc
@@ -10,10 +10,53 @@
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 #include "content/public/browser/browser_thread.h"
+#include "media/base/video_frame.h"
+
+using media::VideoFrame;
 
 namespace content {
 
 const int VideoCaptureBufferPool::kInvalidId = -1;
+
+VideoFrame::Format VideoPixelFormatToVideoFrameFormat(
+    media::VideoPixelFormat pixel_format) {
+  static struct {
+    media::VideoPixelFormat pixel_format;
+    VideoFrame::Format frame_format;
+  } const kVideoPixelFormatToVideoFrameFormat[] = {
+      {media::PIXEL_FORMAT_I420, VideoFrame::I420},
+      {media::PIXEL_FORMAT_TEXTURE, VideoFrame::ARGB},
+      {media::PIXEL_FORMAT_GPUMEMORYBUFFER, VideoFrame::ARGB},
+  };
+
+  for (const auto& format_pair : kVideoPixelFormatToVideoFrameFormat) {
+    if (format_pair.pixel_format == pixel_format)
+      return format_pair.frame_format;
+  }
+  LOG(ERROR) << "Unsupported VideoPixelFormat "
+             << media::VideoCaptureFormat::PixelFormatToString(pixel_format);
+  return VideoFrame::UNKNOWN;
+}
+
+VideoFrame::StorageType VideoPixelFormatToVideoFrameStorageType(
+    media::VideoPixelFormat pixel_format) {
+  static struct {
+    media::VideoPixelFormat pixel_format;
+    VideoFrame::StorageType storage_type;
+  } const kVideoPixelFormatToVideoFrameStorageType[] = {
+      {media::PIXEL_FORMAT_I420, VideoFrame::STORAGE_SHMEM},
+      {media::PIXEL_FORMAT_TEXTURE, VideoFrame::STORAGE_OPAQUE},
+      {media::PIXEL_FORMAT_GPUMEMORYBUFFER, VideoFrame::STORAGE_OPAQUE},
+  };
+
+  for (const auto& format_pair : kVideoPixelFormatToVideoFrameStorageType) {
+    if (format_pair.pixel_format == pixel_format)
+      return format_pair.storage_type;
+  }
+  LOG(ERROR) << "Unsupported VideoPixelFormat "
+             << media::VideoCaptureFormat::PixelFormatToString(pixel_format);
+  return VideoFrame::STORAGE_UNKNOWN;
+}
 
 // A simple holder of a memory-backed buffer and accesors to it.
 class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
@@ -81,8 +124,8 @@
 class VideoCaptureBufferPool::SharedMemTracker final : public Tracker {
  public:
   SharedMemTracker();
-  bool Init(media::VideoPixelFormat format,
-            media::VideoPixelStorage storage_type,
+  bool Init(VideoFrame::Format format,
+            media::VideoFrame::StorageType storage_type,
             const gfx::Size& dimensions) override;
 
   size_t mapped_size() const override { return shared_memory_.mapped_size(); }
@@ -107,8 +150,8 @@
 class VideoCaptureBufferPool::GpuMemoryBufferTracker final : public Tracker {
  public:
   GpuMemoryBufferTracker();
-  bool Init(media::VideoPixelFormat format,
-            media::VideoPixelStorage storage_type,
+  bool Init(VideoFrame::Format format,
+            media::VideoFrame::StorageType storage_type,
             const gfx::Size& dimensions) override;
   ~GpuMemoryBufferTracker() override;
 
@@ -132,24 +175,24 @@
 }
 
 bool VideoCaptureBufferPool::SharedMemTracker::Init(
-    media::VideoPixelFormat format,
-    media::VideoPixelStorage storage_type,
+    VideoFrame::Format format,
+    media::VideoFrame::StorageType storage_type,
     const gfx::Size& dimensions) {
   DVLOG(2) << "allocating ShMem of " << dimensions.ToString();
   set_pixel_format(format);
   set_storage_type(storage_type);
-  // |dimensions| can be 0x0 for trackers that do not require memory backing.
+  // Input |dimensions| can be 0x0 for trackers that do not require memory
+  // backing. The allocated size is calculated using VideoFrame methods since
+  // this will be the abstraction used to wrap the underlying data.
   set_pixel_count(dimensions.GetArea());
-  const size_t byte_count =
-      media::VideoCaptureFormat(dimensions, 0.0f, format, storage_type)
-          .ImageAllocationSize();
+  const size_t byte_count = VideoFrame::AllocationSize(format, dimensions);
   if (!byte_count)
     return true;
   return shared_memory_.CreateAndMapAnonymous(byte_count);
 }
 
 VideoCaptureBufferPool::GpuMemoryBufferTracker::GpuMemoryBufferTracker()
-    : Tracker(), packed_size_(0u), gpu_memory_buffer_(nullptr) {}
+    : Tracker(), gpu_memory_buffer_(nullptr) {}
 
 VideoCaptureBufferPool::GpuMemoryBufferTracker::~GpuMemoryBufferTracker() {
   if (gpu_memory_buffer_->IsMapped())
@@ -157,8 +200,8 @@
 }
 
 bool VideoCaptureBufferPool::GpuMemoryBufferTracker::Init(
-    media::VideoPixelFormat format,
-    media::VideoPixelStorage storage_type,
+    VideoFrame::Format format,
+    media::VideoFrame::StorageType storage_type,
     const gfx::Size& dimensions) {
   DVLOG(2) << "allocating GMB for " << dimensions.ToString();
   // BrowserGpuMemoryBufferManager::current() may not be accessed on IO Thread.
@@ -167,9 +210,6 @@
   set_pixel_format(format);
   set_storage_type(storage_type);
   set_pixel_count(dimensions.GetArea());
-  // |dimensions| can be 0x0 for trackers that do not require memory backing.
-  if (dimensions.GetArea() == 0u)
-    return true;
   gpu_memory_buffer_ =
       BrowserGpuMemoryBufferManager::current()->AllocateGpuMemoryBuffer(
           dimensions,
@@ -240,12 +280,10 @@
 }
 
 int VideoCaptureBufferPool::ReserveForProducer(media::VideoPixelFormat format,
-                                               media::VideoPixelStorage storage,
                                                const gfx::Size& dimensions,
                                                int* buffer_id_to_drop) {
   base::AutoLock lock(lock_);
-  return ReserveForProducerInternal(format, storage, dimensions,
-                                    buffer_id_to_drop);
+  return ReserveForProducerInternal(format, dimensions, buffer_id_to_drop);
 }
 
 void VideoCaptureBufferPool::RelinquishProducerReservation(int buffer_id) {
@@ -303,14 +341,20 @@
 }
 
 int VideoCaptureBufferPool::ReserveForProducerInternal(
-    media::VideoPixelFormat pixel_format,
-    media::VideoPixelStorage storage_type,
+    media::VideoPixelFormat format,
     const gfx::Size& dimensions,
     int* buffer_id_to_drop) {
+  DCHECK(format == media::PIXEL_FORMAT_I420 ||
+         format == media::PIXEL_FORMAT_TEXTURE ||
+         format == media::PIXEL_FORMAT_GPUMEMORYBUFFER );
   lock_.AssertAcquired();
   *buffer_id_to_drop = kInvalidId;
 
   const size_t size_in_pixels = dimensions.GetArea();
+  const media::VideoFrame::Format pixel_format =
+      VideoPixelFormatToVideoFrameFormat(format);
+  const media::VideoFrame::StorageType storage_type =
+      VideoPixelFormatToVideoFrameStorageType(format);
   // Look for a tracker that's allocated, big enough, and not in use. Track the
   // largest one that's not big enough, in case we have to reallocate a tracker.
   *buffer_id_to_drop = kInvalidId;
@@ -349,8 +393,8 @@
   // Create the new tracker.
   const int buffer_id = next_buffer_id_++;
 
-  scoped_ptr<Tracker> tracker = Tracker::CreateTracker(
-      storage_type == media::PIXEL_STORAGE_GPUMEMORYBUFFER);
+  scoped_ptr<Tracker> tracker =
+      Tracker::CreateTracker(format == media::PIXEL_FORMAT_GPUMEMORYBUFFER);
   if (!tracker->Init(pixel_format, storage_type, dimensions)) {
     DLOG(ERROR) << "Error initializing Tracker";
     return kInvalidId;