Remove media::VideoFrame from media::VideoCaptureDevice::Client interface

media/video/capture/video_capture_device_unittest.cc

 // Copyright (c) 2012 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/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/run_loop.h"
@@ skipping 46 matching lines @@
 using ::testing::_;
 using ::testing::AnyNumber;
 using ::testing::Return;
 using ::testing::AtLeast;
 using ::testing::SaveArg;
 
 namespace media {
 
 class MockClient : public media::VideoCaptureDevice::Client {
  public:
-  MOCK_METHOD1(ReserveOutputBuffer,
-      scoped_refptr<media::VideoFrame>(const gfx::Size&));
+  MOCK_METHOD2(ReserveOutputBuffer,
+               scoped_refptr<Buffer>(media::VideoFrame::Format format,
+                                     const gfx::Size& dimensions));
   MOCK_METHOD0(OnErr, void());
 
   explicit MockClient(
       base::Callback<void(const VideoCaptureCapability&)> frame_cb)
-      : main_thread_(base::MessageLoopProxy::current()),
-        frame_cb_(frame_cb) {}
+      : main_thread_(base::MessageLoopProxy::current()), frame_cb_(frame_cb) {}
 
   virtual void OnError() OVERRIDE {
     OnErr();
   }
 
-  virtual void OnIncomingCapturedFrame(
-      const uint8* data,
-      int length,
-      base::Time timestamp,
-      int rotation,
-      bool flip_vert,
-      bool flip_horiz,
-      const VideoCaptureCapability& frame_info) OVERRIDE {
+  virtual void OnIncomingCapturedFrame(const uint8* data,
+                                       int length,
+                                       base::Time timestamp,
+                                       int rotation,
+                                       bool flip_vert,
+                                       bool flip_horiz,
+                                       const VideoCaptureCapability& frame_info)
+      OVERRIDE {
     main_thread_->PostTask(FROM_HERE, base::Bind(frame_cb_, frame_info));
   }
 
-  virtual void OnIncomingCapturedVideoFrame(
-      const scoped_refptr<media::VideoFrame>& frame,
-      base::Time timestamp,
-      int frame_rate) OVERRIDE {
+  virtual void OnIncomingCapturedBuffer(const scoped_refptr<Buffer>& buffer,
+                                        media::VideoFrame::Format format,
+                                        const gfx::Size& dimensions,
+                                        base::Time timestamp,
+                                        int frame_rate) OVERRIDE {
     NOTREACHED();
   }
 
  private:
   scoped_refptr<base::MessageLoopProxy> main_thread_;
   base::Callback<void(const VideoCaptureCapability&)> frame_cb_;
 };
 
 class VideoCaptureDeviceTest : public testing::Test {
  protected:
   typedef media::VideoCaptureDevice::Client Client;
 
   VideoCaptureDeviceTest()
       : loop_(new base::MessageLoop()),
-        client_(new MockClient(base::Bind(
-            &VideoCaptureDeviceTest::OnFrameCaptured,
-            base::Unretained(this)))) {}
+        client_(
+            new MockClient(base::Bind(&VideoCaptureDeviceTest::OnFrameCaptured,
+                                      base::Unretained(this)))) {}
 
   virtual void SetUp() {
 #if defined(OS_ANDROID)
     media::VideoCaptureDeviceAndroid::RegisterVideoCaptureDevice(
         base::android::AttachCurrentThread());
 #endif
   }
 
   void ResetWithNewClient() {
     client_.reset(new MockClient(base::Bind(
@@ skipping 137 matching lines @@
     } else {
       resolution = gfx::Size(1280, 1024);
     }
     VideoCaptureCapability requested_format(
         resolution.width(),
         resolution.height(),
         30,
         PIXEL_FORMAT_I420,
         ConstantResolutionVideoCaptureDevice);
 
-    device->AllocateAndStart(requested_format,
-                             client_.PassAs<Client>());
+    device->AllocateAndStart(requested_format, client_.PassAs<Client>());
     device->StopAndDeAllocate();
   }
 
   // Finally, do a device start and wait for it to finish.
   gfx::Size resolution;
   VideoCaptureCapability requested_format(
       320,
       240,
       30,
       PIXEL_FORMAT_I420,
       ConstantResolutionVideoCaptureDevice);
 
   ResetWithNewClient();
   scoped_ptr<VideoCaptureDevice> device(
       VideoCaptureDevice::Create(names_.front()));
 
-  device->AllocateAndStart(requested_format,
-                           client_.PassAs<Client>());
+  device->AllocateAndStart(requested_format, client_.PassAs<Client>());
   WaitForCapturedFrame();
   device->StopAndDeAllocate();
   device.reset();
   EXPECT_EQ(last_frame_info().width, 320);
   EXPECT_EQ(last_frame_info().height, 240);
 }
 
 TEST_F(VideoCaptureDeviceTest, DeAllocateCameraWhileRunning) {
   VideoCaptureDevice::GetDeviceNames(&names_);
   if (!names_.size()) {
@@ skipping 136 matching lines @@
                                                       &capture_formats);
     EXPECT_GE(capture_formats.size(), 1u);
     EXPECT_EQ(capture_formats[0].width, 640);
     EXPECT_EQ(capture_formats[0].height, 480);
     EXPECT_EQ(capture_formats[0].color, media::PIXEL_FORMAT_I420);
     EXPECT_GE(capture_formats[0].frame_rate, 20);
   }
 }
 
 };  // namespace media