Revert of VideoCapture: add support for GpuMemoryBuffer allocation and lifetime mgmt in VideoCaptureBufferPool

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"
 #include "media/video/capture/fake_video_capture_device.h"
 #include "media/video/capture/fake_video_capture_device_factory.h"
 #include "media/video/capture/video_capture_device.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using ::testing::SaveArg;
 
 namespace media {
 
 namespace {
 
 static const FakeVideoCaptureDevice::FakeVideoCaptureDeviceType
 kCaptureTypes[] = {
   FakeVideoCaptureDevice::USING_OWN_BUFFERS,
-  FakeVideoCaptureDevice::USING_OWN_BUFFERS_TRIPLANAR,
-  FakeVideoCaptureDevice::USING_CLIENT_BUFFERS_I420,
-  FakeVideoCaptureDevice::USING_CLIENT_BUFFERS_GPU,
+  FakeVideoCaptureDevice::USING_CLIENT_BUFFERS,
+  // TODO(mcasas): Add FakeVideoCaptureDevice::USING_GPU_MEMORY_BUFFERS when
+  // implemented.
 };
 
 // This class is a Client::Buffer that allocates and frees the requested |size|.
 class MockBuffer : public VideoCaptureDevice::Client::Buffer {
  public:
   MockBuffer(int buffer_id, size_t size)
-      : id_(buffer_id), size_(size), data_(new uint8[size_]) {}
-  ~MockBuffer() override { delete[] data_; }
+      : id_(buffer_id),
+        size_(size),
+        data_(new uint8[size_]) {}
   int id() const override { return id_; }
+  void* data() const override { return static_cast<void*>(data_); }
   size_t size() const override { return size_; }
-  void* data() override { return data_; }
-  ClientBuffer AsClientBuffer() override { return nullptr; }
 
  private:
+  ~MockBuffer() override { delete[] data_; }
+
   const int id_;
   const size_t size_;
   uint8* const data_;
 };
 
 class MockClient : public VideoCaptureDevice::Client {
  public:
+  MOCK_METHOD9(OnIncomingCapturedYuvData,
+               void (const uint8* y_data,
+                     const uint8* u_data,
+                     const uint8* v_data,
+                     size_t y_stride,
+                     size_t u_stride,
+                     size_t v_stride,
+                     const VideoCaptureFormat& frame_format,
+                     int clockwise_rotation,
+                     const base::TimeTicks& timestamp));
   MOCK_METHOD1(OnError, void(const std::string& reason));
 
   explicit MockClient(base::Callback<void(const VideoCaptureFormat&)> frame_cb)
       : frame_cb_(frame_cb) {}
 
-  // Client virtual methods for capturing using Device Buffers.
+  // Client virtual method for capturing using Device Buffers.
   void OnIncomingCapturedData(const uint8* data,
                               int length,
                               const VideoCaptureFormat& format,
                               int rotation,
                               const base::TimeTicks& timestamp) {
     frame_cb_.Run(format);
   }
-  void OnIncomingCapturedYuvData(const uint8* y_data,
-                                 const uint8* u_data,
-                                 const uint8* v_data,
-                                 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_refptr<Buffer> ReserveOutputBuffer(media::VideoPixelFormat format,
+                                            const gfx::Size& dimensions) {
+    EXPECT_EQ(format, PIXEL_FORMAT_I420);
     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);
+    return make_scoped_refptr(new MockBuffer(0, dimensions.GetArea() * 3 / 2));
   }
   void OnIncomingCapturedVideoFrame(
-      scoped_ptr<Buffer> buffer,
+      const scoped_refptr<Buffer>& buffer,
       const scoped_refptr<media::VideoFrame>& frame,
       const base::TimeTicks& timestamp) {
     VideoCaptureFormat format(frame->natural_size(), 30.0, PIXEL_FORMAT_I420);
     frame_cb_.Run(format);
   }
 
  private:
   base::Callback<void(const VideoCaptureFormat&)> frame_cb_;
 };
 
@@ skipping 22 matching lines @@
   FakeVideoCaptureDeviceTest()
       : loop_(new base::MessageLoop()),
         client_(new MockClient(
             base::Bind(&FakeVideoCaptureDeviceTest::OnFrameCaptured,
                        base::Unretained(this)))),
         video_capture_device_factory_(new FakeVideoCaptureDeviceFactory()) {
     device_enumeration_listener_ = new DeviceEnumerationListener();
   }
 
   void SetUp() override {
+    EXPECT_CALL(*client_, OnIncomingCapturedYuvData(_,_,_,_,_,_,_,_,_))
+               .Times(0);
     EXPECT_CALL(*client_, OnError(_)).Times(0);
   }
 
   void OnFrameCaptured(const VideoCaptureFormat& format) {
     last_format_ = format;
     run_loop_->QuitClosure().Run();
   }
 
   void WaitForCapturedFrame() {
     run_loop_.reset(new base::RunLoop());
@@ skipping 69 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