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

media/base/video_capture_types.h

Index: media/base/video_capture_types.h
diff --git a/media/base/video_capture_types.h b/media/base/video_capture_types.h
index c849ed7b35f9673d9112da267904754c9aafd25e..df1bf18c0f219634d31d721edce57317fac3a8ad 100644
--- a/media/base/video_capture_types.h
+++ b/media/base/video_capture_types.h
@@ -28,12 +28,16 @@ enum VideoPixelFormat {
   PIXEL_FORMAT_RGB32,
   PIXEL_FORMAT_ARGB,
   PIXEL_FORMAT_MJPEG,
-  PIXEL_FORMAT_TEXTURE,  // Capture format as a GL texture.
-  PIXEL_FORMAT_GPUMEMORYBUFFER,
   PIXEL_FORMAT_UNKNOWN,  // Color format not set.
   PIXEL_FORMAT_MAX,
 };
 
+enum VideoPixelStorage {
+  PIXEL_STORAGE_CPU,
+  PIXEL_STORAGE_TEXTURE,

[hubbe, 2015/06/16 21:11:35]

Does PIXEL_FORMAT_???? make any sense if the storage is a texture?
Please add some comments to explain the semantics.

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

Done.

+  PIXEL_STORAGE_GPUMEMORYBUFFER,
+};
+
 // Policies for capture devices that have source content that varies in size.
 // It is up to the implementation how the captured content will be transformed
 // (e.g., scaling and/or letterboxing) in order to produce video frames that
@@ -70,9 +74,14 @@ class MEDIA_EXPORT VideoCaptureFormat {
   VideoCaptureFormat(const gfx::Size& frame_size,
                      float frame_rate,
                      VideoPixelFormat pixel_format);
+  VideoCaptureFormat(const gfx::Size& frame_size,
+                     float frame_rate,
+                     VideoPixelFormat pixel_format,
+                     VideoPixelStorage pixel_storage);
 
   std::string ToString() const;
   static std::string PixelFormatToString(VideoPixelFormat format);
+  static std::string PixelStorageToString(VideoPixelStorage storage);
 
   // Returns the required buffer size to hold an image of a given
   // VideoCaptureFormat with no padding and tightly packed.
@@ -91,6 +100,7 @@ class MEDIA_EXPORT VideoCaptureFormat {
   gfx::Size frame_size;
   float frame_rate;
   VideoPixelFormat pixel_format;
+  VideoPixelStorage pixel_storage;
 };
 
 typedef std::vector<VideoCaptureFormat> VideoCaptureFormats;