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

content/browser/renderer_host/media/video_capture_buffer_pool.cc

 // Copyright (c) 2013 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_buffer_pool.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #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},
+      {media::PIXEL_FORMAT_ARGB, 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) {
+VideoFrame::StorageType VideoPixelStorageToVideoFrameStorageType(
+    media::VideoPixelStorage pixel_storage) {
   static struct {
-    media::VideoPixelFormat pixel_format;
+    media::VideoPixelStorage pixel_storage;
     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},
+  } const kVideoPixelStorageToVideoFrameStorageType[] = {
+      {media::PIXEL_STORAGE_CPU, VideoFrame::STORAGE_SHMEM},
+      {media::PIXEL_STORAGE_TEXTURE, VideoFrame::STORAGE_OPAQUE},
+      {media::PIXEL_STORAGE_GPUMEMORYBUFFER,

[miu, 2015/06/13 00:41:37]

nit: Up to you, but this feels more readable:

#if defined(OS_LINUX)
  {media::PIXEL_STORAGE_GPUMEMORYBUFFER, VideoFrame::STORAGE_DMABUFS},
#else
  {media::PIXEL_STORAGE_GPUMEMORYBUFFER, VideoFrame::STORAGE_SHMEM},
#endif

[mcasas, 2015/06/16 23:14:01]

Yes. And this is actually for USE_OZONE build,
not just for Linux, corrected.

+#if defined(OS_LINUX)
+          VideoFrame::STORAGE_DMABUFS},
+#else
+          VideoFrame::STORAGE_SHMEM},
+#endif
   };
 
-  for (const auto& format_pair : kVideoPixelFormatToVideoFrameStorageType) {
-    if (format_pair.pixel_format == pixel_format)
+  for (const auto& format_pair : kVideoPixelStorageToVideoFrameStorageType) {
+    if (format_pair.pixel_storage == pixel_storage)
       return format_pair.storage_type;
   }
-  LOG(ERROR) << "Unsupported VideoPixelFormat "
-             << media::VideoCaptureFormat::PixelFormatToString(pixel_format);
+  LOG(ERROR) << "Unsupported VideoPixelStorage " << pixel_storage;
   return VideoFrame::STORAGE_UNKNOWN;
 }
 
 // A simple holder of a memory-backed buffer and accesors to it.
 class SimpleBufferHandle final : public VideoCaptureBufferPool::BufferHandle {
  public:
   SimpleBufferHandle(void* data, size_t size, base::SharedMemoryHandle handle)
       : data_(data), size_(size), handle_(handle) {}
   ~SimpleBufferHandle() override {}
 
@@ skipping 208 matching lines @@
   if (!tracker) {
     NOTREACHED() << "Invalid buffer_id.";
     return scoped_ptr<BufferHandle>();
   }
 
   DCHECK(tracker->held_by_producer());
   return tracker->GetBufferHandle();
 }
 
 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, dimensions, buffer_id_to_drop);
+  return ReserveForProducerInternal(format, storage, dimensions,
+                                    buffer_id_to_drop);
 }
 
 void VideoCaptureBufferPool::RelinquishProducerReservation(int buffer_id) {
   base::AutoLock lock(lock_);
   Tracker* tracker = GetTracker(buffer_id);
   if (!tracker) {
     NOTREACHED() << "Invalid buffer_id.";
     return;
   }
   DCHECK(tracker->held_by_producer());
@@ skipping 27 matching lines @@
     return;
   }
   DCHECK_GE(tracker->consumer_hold_count(), num_clients);
 
   tracker->set_consumer_hold_count(tracker->consumer_hold_count() -
                                    num_clients);
 }
 
 int VideoCaptureBufferPool::ReserveForProducerInternal(
     media::VideoPixelFormat format,
+    media::VideoPixelStorage storage,
     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);
+      VideoPixelStorageToVideoFrameStorageType(storage);
   // 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;
   size_t largest_size_in_pixels = 0;
   TrackerMap::iterator tracker_to_drop = trackers_.end();
   for (TrackerMap::iterator it = trackers_.begin(); it != trackers_.end();
        ++it) {
     Tracker* const tracker = it->second;
     if (!tracker->consumer_hold_count() && !tracker->held_by_producer()) {
       if (tracker->pixel_count() >= size_in_pixels &&
@@ skipping 18 matching lines @@
       return kInvalidId;
     }
     *buffer_id_to_drop = tracker_to_drop->first;
     delete tracker_to_drop->second;
     trackers_.erase(tracker_to_drop);
   }
 
   // Create the new tracker.
   const int buffer_id = next_buffer_id_++;
 
-  scoped_ptr<Tracker> tracker =
-      Tracker::CreateTracker(format == media::PIXEL_FORMAT_GPUMEMORYBUFFER);
+  const bool use_simple_tracker =
+      storage == media::PIXEL_STORAGE_GPUMEMORYBUFFER;
+  scoped_ptr<Tracker> tracker = Tracker::CreateTracker(use_simple_tracker);
   if (!tracker->Init(pixel_format, storage_type, dimensions)) {
     DLOG(ERROR) << "Error initializing Tracker";
     return kInvalidId;
   }
   tracker->set_held_by_producer(true);
   trackers_[buffer_id] = tracker.release();
 
   return buffer_id;
 }
 
 VideoCaptureBufferPool::Tracker* VideoCaptureBufferPool::GetTracker(
     int buffer_id) {
   TrackerMap::const_iterator it = trackers_.find(buffer_id);
   return (it == trackers_.end()) ? NULL : it->second;
 }
 
 }  // namespace content