From Video Capture, abolish OnFrameInfo and enable resolution changes

content/browser/renderer_host/media/web_contents_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 "content/browser/renderer_host/media/web_contents_video_capture_device.h"
 
 #include "base/bind_helpers.h"
 #include "base/debug/debugger.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 293 matching lines @@
 };
 
 // A stub consumer of captured video frames, which checks the output of
 // WebContentsVideoCaptureDevice.
 class StubClient : public media::VideoCaptureDevice::Client {
  public:
   StubClient(const base::Callback<void(SkColor)>& color_callback,
              const base::Closure& error_callback)
       : color_callback_(color_callback),
         error_callback_(error_callback) {
-    buffer_pool_ = new VideoCaptureBufferPool(
-        media::VideoFrame::AllocationSize(media::VideoFrame::I420,
-                                          gfx::Size(kTestWidth, kTestHeight)),
-        2);
-    EXPECT_TRUE(buffer_pool_->Allocate());
+    buffer_pool_ = new VideoCaptureBufferPool(2);
   }
   virtual ~StubClient() {}
 
-  virtual scoped_refptr<media::VideoFrame> ReserveOutputBuffer() OVERRIDE {
-    return buffer_pool_->ReserveI420VideoFrame(gfx::Size(kTestWidth,
-                                                         kTestHeight),
-                                               0);
+  virtual scoped_refptr<media::VideoFrame> ReserveOutputBuffer(
+      const gfx::Size& size) OVERRIDE {
+    int buffer_id_to_drop = VideoCaptureBufferPool::kInvalidId;
+    return buffer_pool_->ReserveI420VideoFrame(size, 0, &buffer_id_to_drop);

[Ami GONE FROM CHROMIUM, 2013/10/04 00:24:15]

Do you want to assert anything about buffer_id_to_drop, or use it?

[ncarter (slow), 2013/10/16 02:08:40]

Not really. We're not tracking the buffer_ids here, nor is this a test of
reallocation behavior. This code is using buffer_pool_ as an expedience.

[Ami GONE FROM CHROMIUM, 2013/10/17 20:31:45]

Ok, then s/buffer_id_to_drop/IGNORED_buffer_id_to_drop/

[ncarter (slow), 2013/10/22 01:06:20]

Done.

   }
 
   virtual void OnIncomingCapturedFrame(
       const uint8* data,
       int length,
       base::Time timestamp,
       int rotation,
       bool flip_vert,
       bool flip_horiz) OVERRIDE {
     FAIL();
@@ skipping 15 matching lines @@
     // the analysis is too slow, the backlog of frames will grow without bound
     // and trouble erupts. http://crbug.com/174519
     color_callback_.Run((SkColorSetRGB(yuv[0], yuv[1], yuv[2])));
   }
 
   virtual void OnError() OVERRIDE {
     error_callback_.Run();
   }
 
   virtual void OnFrameInfo(const media::VideoCaptureCapability& info) OVERRIDE {
-    EXPECT_EQ(kTestWidth, info.width);
-    EXPECT_EQ(kTestHeight, info.height);
     EXPECT_EQ(kTestFramesPerSecond, info.frame_rate);
-    EXPECT_EQ(media::PIXEL_FORMAT_I420, info.color);
   }
 
  private:
   scoped_refptr<VideoCaptureBufferPool> buffer_pool_;
   base::Callback<void(SkColor)> color_callback_;
   base::Closure error_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(StubClient);
 };
 
@@ skipping 448 matching lines @@
   source()->SetSolidColor(SK_ColorGREEN);
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorGREEN));
   source()->SetSolidColor(SK_ColorRED);
   ASSERT_NO_FATAL_FAILURE(client_observer()->WaitForNextColor(SK_ColorRED));
 
   device()->StopAndDeAllocate();
 }
 
 }  // namespace
 }  // namespace content