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

content/browser/renderer_host/media/video_capture_buffer_pool.h

Index: content/browser/renderer_host/media/video_capture_buffer_pool.h
diff --git a/content/browser/renderer_host/media/video_capture_buffer_pool.h b/content/browser/renderer_host/media/video_capture_buffer_pool.h
index ddeb9b75bb89ea1caac7ee335974045826599ba5..d18d073edc263d1381c6bd7890e5d8e7a37f6c4b 100644
--- a/content/browser/renderer_host/media/video_capture_buffer_pool.h
+++ b/content/browser/renderer_host/media/video_capture_buffer_pool.h
@@ -84,6 +84,7 @@ class CONTENT_EXPORT VideoCaptureBufferPool
   // 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);
 
@@ -117,21 +118,21 @@ class CONTENT_EXPORT VideoCaptureBufferPool
 
     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_; }
@@ -150,8 +151,8 @@ class CONTENT_EXPORT VideoCaptureBufferPool
 
    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.
@@ -162,6 +163,7 @@ class CONTENT_EXPORT VideoCaptureBufferPool
   virtual ~VideoCaptureBufferPool();
 
   int ReserveForProducerInternal(media::VideoPixelFormat format,
+                                 media::VideoPixelStorage storage,
                                  const gfx::Size& dimensions,
                                  int* tracker_id_to_drop);