Revert of Add framerate to VideoSinkWants and ability to signal on overuse

webrtc/call/call_perf_tests.cc

 /*
  *  Copyright (c) 2013 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 455 matching lines @@
   net_config.delay_standard_deviation_ms = 10;
   // TODO(wu): lower the threshold as the calculation/estimatation becomes more
   // accurate.
   const int kThresholdMs = 100;
   const int kStartTimeMs = 10000;
   const int kRunTimeMs = 20000;
   TestCaptureNtpTime(net_config, kThresholdMs, kStartTimeMs, kRunTimeMs);
 }
 
 TEST_F(CallPerfTest, ReceivesCpuOveruseAndUnderuse) {
-  // Set fake encoder delay to 150% (3/2) of time limit when simulating overuse.
-  const int kOveruseFrameIntervalMs = (3 * 1000) / (2 * kDefaultFramerate);
-
   class LoadObserver : public test::SendTest,
                        public test::FrameGeneratorCapturer::SinkWantsObserver {
    public:
     LoadObserver()
         : SendTest(kLongTimeoutMs),
-          test_phase_(TestPhase::kStart),
-          encoder_(Clock::GetRealTimeClock(), kOveruseFrameIntervalMs) {}
+          expect_lower_resolution_wants_(true),
+          encoder_(Clock::GetRealTimeClock(), 60 /* delay_ms */) {}
 
     void OnFrameGeneratorCapturerCreated(
         test::FrameGeneratorCapturer* frame_generator_capturer) override {
       frame_generator_capturer->SetSinkWantsObserver(this);
       // Set a high initial resolution to be sure that we can scale down.
       frame_generator_capturer->ChangeResolution(1920, 1080);
     }
 
     // OnSinkWantsChanged is called when FrameGeneratorCapturer::AddOrUpdateSink
     // is called.
-    // TODO(sprang): Add integration test for maintain-framerate mode?
     void OnSinkWantsChanged(rtc::VideoSinkInterface<VideoFrame>* sink,
                             const rtc::VideoSinkWants& wants) override {
       // First expect CPU overuse. Then expect CPU underuse when the encoder
       // delay has been decreased.
-      switch (test_phase_) {
-        case TestPhase::kStart:
-          if (wants.max_pixel_count < std::numeric_limits<int>::max()) {
-            // On adapting down, ViEEncoder::VideoSourceProxy will set only the
-            // max pixel count, leaving the target unset.
-            test_phase_ = TestPhase::kAdaptedDown;
-            encoder_.SetDelay(2);
-          } else {
-            ADD_FAILURE() << "Got unexpected adaptation request, max res = "
-                          << wants.max_pixel_count << ", target res = "
-                          << wants.target_pixel_count.value_or(-1)
-                          << ", max fps = " << wants.max_framerate_fps;
-          }
-          break;
-        case TestPhase::kAdaptedDown:
-          // On adapting up, the adaptation counter will again be at zero, and
-          // so all constraints will be reset.
-          if (wants.max_pixel_count == std::numeric_limits<int>::max() &&
-              !wants.target_pixel_count) {
-            test_phase_ = TestPhase::kAdaptedUp;
-            observation_complete_.Set();
-          } else {
-            ADD_FAILURE() << "Got unexpected adaptation request, max res = "
-                          << wants.max_pixel_count << ", target res = "
-                          << wants.target_pixel_count.value_or(-1)
-                          << ", max fps = " << wants.max_framerate_fps;
-          }
-          break;
-        case TestPhase::kAdaptedUp:
-          ADD_FAILURE() << "Got unexpected adaptation request, max res = "
-                        << wants.max_pixel_count << ", target res = "
-                        << wants.target_pixel_count.value_or(-1)
-                        << ", max fps = " << wants.max_framerate_fps;
+      if (wants.target_pixel_count &&
+          *wants.target_pixel_count <
+              wants.max_pixel_count.value_or(std::numeric_limits<int>::max())) {
+        // On adapting up, ViEEncoder::VideoSourceProxy will set the target
+        // pixel count to a step up from the current and the max value to
+        // something higher than the target.
+        EXPECT_FALSE(expect_lower_resolution_wants_);
+        observation_complete_.Set();
+      } else if (wants.max_pixel_count) {
+        // On adapting down, ViEEncoder::VideoSourceProxy will set only the max
+        // pixel count, leaving the target unset.
+        EXPECT_TRUE(expect_lower_resolution_wants_);
+        expect_lower_resolution_wants_ = false;
+        encoder_.SetDelay(2);
       }
     }
 
     void ModifyVideoConfigs(
         VideoSendStream::Config* send_config,
         std::vector<VideoReceiveStream::Config>* receive_configs,
         VideoEncoderConfig* encoder_config) override {
       send_config->encoder_settings.encoder = &encoder_;
     }
 
     void PerformTest() override {
       EXPECT_TRUE(Wait()) << "Timed out before receiving an overuse callback.";
     }
 
-    enum class TestPhase { kStart, kAdaptedDown, kAdaptedUp } test_phase_;
+    bool expect_lower_resolution_wants_;
     test::DelayedEncoder encoder_;
   } test;
 
   RunBaseTest(&test);
 }
 
 void CallPerfTest::TestMinTransmitBitrate(bool pad_to_min_bitrate) {
   static const int kMaxEncodeBitrateKbps = 30;
   static const int kMinTransmitBitrateBps = 150000;
   static const int kMinAcceptableTransmitBitrate = 130;
@@ skipping 203 matching lines @@
     uint32_t last_set_bitrate_kbps_;
     VideoSendStream* send_stream_;
     test::FrameGeneratorCapturer* frame_generator_;
     VideoEncoderConfig encoder_config_;
   } test;
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc