Cleanup the VideoAdapter

webrtc/media/base/videocapturer_unittest.cc

 /*
  *  Copyright (c) 2008 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 240 matching lines @@
   EXPECT_TRUE(capturer_->IsRunning());
 
   EXPECT_EQ(0, renderer_.num_rendered_frames());
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(1, renderer_.num_rendered_frames());
   EXPECT_EQ(1280, renderer_.width());
   EXPECT_EQ(720, renderer_.height());
 
   // 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());
   EXPECT_EQ(960, renderer_.width());
   EXPECT_EQ(540, renderer_.height());
 
   // 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());
   EXPECT_EQ(640, renderer_.width());
   EXPECT_EQ(360, renderer_.height());
 
   // Adding a new renderer should not affect resolution.
   cricket::FakeVideoRenderer renderer2;
   capturer_->AddOrUpdateSink(&renderer2, rtc::VideoSinkWants());
   EXPECT_TRUE(capturer_->CaptureFrame());
@@ skipping 18 matching lines @@
 
   // Updating with no wants should not affect resolution.
   capturer_->AddOrUpdateSink(&renderer2, rtc::VideoSinkWants());
   EXPECT_TRUE(capturer_->CaptureFrame());
   EXPECT_EQ(6, renderer_.num_rendered_frames());
   EXPECT_EQ(960, renderer_.width());
   EXPECT_EQ(540, renderer_.height());
   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) {
   InitScreencast();
 
   const int kMaxWidth = 4096;
   const int kMaxHeight = 3072;
   int kWidth = kMaxWidth + 4;
   int kHeight = kMaxHeight + 4;
 
@@ skipping 466 matching lines @@
   capturer_->set_enable_camera_list(true);
   capturer_->ConstrainSupportedFormats(vga_format);
   EXPECT_EQ(2u, capturer_->GetSupportedFormats()->size());
   // To make sure it's not just the camera list being broken, add in VGA and
   // try again. This time, only the VGA format should be there.
   supported_formats.push_back(vga_format);
   capturer_->ResetSupportedFormats(supported_formats);
   ASSERT_EQ(1u, capturer_->GetSupportedFormats()->size());
   EXPECT_EQ(vga_format.height, capturer_->GetSupportedFormats()->at(0).height);
 }