Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

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 84 matching lines @@
   void HoldForConsumers(int buffer_id, int num_clients);
 
   // Indicate that one or more consumers are done with a particular buffer. This
   // effectively is the opposite of HoldForConsumers(). Once the consumers are
   // done, a buffer is returned to the pool for reuse.
   void RelinquishConsumerHold(int buffer_id, int num_clients);
 
  private:
   class GpuMemoryBufferTracker;
   class SharedMemTracker;
-  // Generic class to keep track of the state of a given mappable resource.
+  // 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,
                       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) {
       pixel_format_ = format;
     }
+    media::VideoFrame::StorageType storage_type() const {
+      return storage_type_;
+    }
+    void set_storage_type(media::VideoFrame::StorageType 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_;
     // 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,
@@ skipping 14 matching lines @@
   // 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_