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

content/browser/renderer_host/media/video_capture_buffer_pool.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_BUFFER_POOL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_BUFFER_POOL_H_
 
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 66 matching lines @@
   //
   // If successful, the reserved buffer remains reserved (and writable by the
   // producer) until ownership is transferred either to the consumer via
   // HoldForConsumers(), or back to the pool with
   // RelinquishProducerReservation().
   //
   // On occasion, this call will decide to free an old buffer to make room for a
   // new allocation at a larger size. If so, the ID of the destroyed buffer is
   // returned via |buffer_id_to_drop|.
   int ReserveForProducer(media::VideoPixelFormat format,
+                         media::VideoPixelStorage storage,
                          const gfx::Size& dimensions,
                          int* buffer_id_to_drop);
 
   // Indicate that a buffer held for the producer should be returned back to the
   // pool without passing on to the consumer. This effectively is the opposite
   // of ReserveForProducer().
   void RelinquishProducerReservation(int buffer_id);
 
   // Transfer a buffer from producer to consumer ownership.
   // |buffer_id| must be a buffer index previously returned by
@@ skipping 13 matching lines @@
   class GpuMemoryBufferTracker;
   class SharedMemTracker;
   // Generic class to keep track of the state of a given mappable resource. Each
   // Tracker carries indication of pixel format and storage type.
   class Tracker {
    public:
     static scoped_ptr<Tracker> CreateTracker(bool use_gmb);
 
     Tracker()
         : pixel_count_(0), held_by_producer_(false), consumer_hold_count_(0) {}
-    virtual bool Init(media::VideoFrame::Format format,
-                      media::VideoFrame::StorageType storage_type,
+    virtual bool Init(media::VideoPixelFormat format,
+                      media::VideoPixelStorage storage_type,
                       const gfx::Size& dimensions) = 0;
     virtual ~Tracker();
 
     size_t pixel_count() const { return pixel_count_; }
     void set_pixel_count(size_t count) { pixel_count_ = count; }
-    media::VideoFrame::Format pixel_format() const { return pixel_format_; }
-    void set_pixel_format(media::VideoFrame::Format format) {
+    media::VideoPixelFormat pixel_format() const { return pixel_format_; }
+    void set_pixel_format(media::VideoPixelFormat format) {
       pixel_format_ = format;
     }
-    media::VideoFrame::StorageType storage_type() const {
+    media::VideoPixelStorage storage_type() const {
       return storage_type_;
     }
-    void set_storage_type(media::VideoFrame::StorageType storage_type) {
+    void set_storage_type(media::VideoPixelStorage storage_type) {
       storage_type_ = storage_type;
     }
     bool held_by_producer() const { return held_by_producer_; }
     void set_held_by_producer(bool value) { held_by_producer_ = value; }
     int consumer_hold_count() const { return consumer_hold_count_; }
     void set_consumer_hold_count(int value) { consumer_hold_count_ = value; }
 
     // Returns a handle to the underlying storage, be that a block of Shared
     // Memory, or a GpuMemoryBuffer.
     virtual scoped_ptr<BufferHandle> GetBufferHandle() = 0;
     // The actual size of the underlying backing resource.
     virtual size_t mapped_size() const = 0;
 
     virtual bool ShareToProcess(base::ProcessHandle process_handle,
                                 base::SharedMemoryHandle* new_handle) = 0;
 
    private:
     size_t pixel_count_;
-    media::VideoFrame::Format pixel_format_;
-    media::VideoFrame::StorageType storage_type_;
+    media::VideoPixelFormat pixel_format_;
+    media::VideoPixelStorage storage_type_;
     // Indicates whether this Tracker is currently referenced by the producer.
     bool held_by_producer_;
     // Number of consumer processes which hold this Tracker.
     int consumer_hold_count_;
   };
 
   friend class base::RefCountedThreadSafe<VideoCaptureBufferPool>;
   virtual ~VideoCaptureBufferPool();
 
   int ReserveForProducerInternal(media::VideoPixelFormat format,
+                                 media::VideoPixelStorage storage,
                                  const gfx::Size& dimensions,
                                  int* tracker_id_to_drop);
 
   Tracker* GetTracker(int buffer_id);
 
   // The max number of buffers that the pool is allowed to have at any moment.
   const int count_;
 
   // Protects everything below it.
   mutable base::Lock lock_;
 
   // The ID of the next buffer.
   int next_buffer_id_;
 
   // The buffers, indexed by the first parameter, a buffer id.
   using TrackerMap = std::map<int, Tracker*>;
   TrackerMap trackers_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureBufferPool);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_VIDEO_CAPTURE_BUFFER_POOL_H_