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

media/video/capture/fake_video_capture_device_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/thread.h"
 #include "media/base/video_capture_types.h"
@@ skipping 62 matching lines @@
                                  size_t y_stride,
                                  size_t u_stride,
                                  size_t v_stride,
                                  const VideoCaptureFormat& frame_format,
                                  int clockwise_rotation,
                                  const base::TimeTicks& timestamp) {
     frame_cb_.Run(frame_format);
   }
 
   // Virtual methods for capturing using Client's Buffers.
-  scoped_ptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format,
-                                         const gfx::Size& dimensions) {
-    EXPECT_TRUE(format == PIXEL_FORMAT_I420 ||
-                format == PIXEL_FORMAT_GPUMEMORYBUFFER);
+  scoped_ptr<Buffer> ReserveOutputBuffer(const gfx::Size& dimensions,
+                                         media::VideoPixelFormat format,
+                                         media::VideoPixelStorage storage) {
+    EXPECT_TRUE((format == media::PIXEL_FORMAT_I420 &&
+                 storage == media::PIXEL_STORAGE_CPU) ||
+                (format == media::PIXEL_FORMAT_ARGB &&
+                 storage == media::PIXEL_STORAGE_GPUMEMORYBUFFER));
     EXPECT_GT(dimensions.GetArea(), 0);
     const VideoCaptureFormat frame_format(dimensions, 0.0, format);
     return make_scoped_ptr(
         new MockBuffer(0, frame_format.ImageAllocationSize()));
   }
   void OnIncomingCapturedBuffer(scoped_ptr<Buffer> buffer,
                                 const VideoCaptureFormat& frame_format,
                                 const base::TimeTicks& timestamp) {
     frame_cb_.Run(frame_format);
   }
@@ skipping 125 matching lines @@
     EXPECT_EQ(supported_formats[2].pixel_format, PIXEL_FORMAT_I420);
     EXPECT_GE(supported_formats[2].frame_rate, 20.0);
     EXPECT_EQ(supported_formats[3].frame_size.width(), 1920);
     EXPECT_EQ(supported_formats[3].frame_size.height(), 1080);
     EXPECT_EQ(supported_formats[3].pixel_format, PIXEL_FORMAT_I420);
     EXPECT_GE(supported_formats[3].frame_rate, 20.0);
   }
 }
 
 };  // namespace media