Cleanup the VideoAdapter

webrtc/media/base/videocapturer_unittest.cc

Index: webrtc/media/base/videocapturer_unittest.cc
diff --git a/webrtc/media/base/videocapturer_unittest.cc b/webrtc/media/base/videocapturer_unittest.cc
index 40c770608f9dfb547fc84e25389cd9db6d8f24db..ea7574e59c7f70bd53e681e575d198f05baf4f92 100644
--- a/webrtc/media/base/videocapturer_unittest.cc
+++ b/webrtc/media/base/videocapturer_unittest.cc
@@ -258,7 +258,7 @@ TEST_F(VideoCapturerTest, SinkWantsMaxPixelAndMaxPixelCountStepUp) {
 
   // Request a lower resolution.
   rtc::VideoSinkWants wants;
-  wants.max_pixel_count = rtc::Optional<int>(1280 * 720 / 2);
+  wants.max_pixel_count = rtc::Optional<int>(1280 * 720 * 3 / 5);

[nisse-webrtc, 2016/04/01 07:09:35]

Our magic constants here need commenting. (And more where they appear in the
actual code rather than the test cases. Maybe "same fraction as used ..." is
appropriate here)

[perkj_webrtc, 2016/04/01 11:56:27]

Done.

   capturer_->AddOrUpdateSink(&renderer_, wants);
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(2, renderer_.num_rendered_frames());
@@ -267,7 +267,7 @@ TEST_F(VideoCapturerTest, SinkWantsMaxPixelAndMaxPixelCountStepUp) {
 
   // Request a lower resolution.
   wants.max_pixel_count =
-      rtc::Optional<int>(renderer_.width() * renderer_.height() / 2);
+      rtc::Optional<int>(renderer_.width() * renderer_.height() * 3 / 5);
   capturer_->AddOrUpdateSink(&renderer_, wants);
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(3, renderer_.num_rendered_frames());
@@ -306,6 +306,17 @@ TEST_F(VideoCapturerTest, SinkWantsMaxPixelAndMaxPixelCountStepUp) {
   EXPECT_EQ(3, renderer2.num_rendered_frames());
   EXPECT_EQ(960, renderer2.width());
   EXPECT_EQ(540, renderer2.height());
+
+  // But resetting the wants should reset the resolution to what the camera is
+  // opened with.
+  capturer_->AddOrUpdateSink(&renderer_, rtc::VideoSinkWants());
+  EXPECT_TRUE(capturer_->CaptureFrame());
+  EXPECT_EQ(7, renderer_.num_rendered_frames());
+  EXPECT_EQ(1280, renderer_.width());
+  EXPECT_EQ(720, renderer_.height());
+  EXPECT_EQ(4, renderer2.num_rendered_frames());
+  EXPECT_EQ(1280, renderer2.width());
+  EXPECT_EQ(720, renderer2.height());;
 }
 
 TEST_F(VideoCapturerTest, ScreencastScaledSuperLarge) {