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 476 matching lines @@
       frame_generator_capturer->ChangeResolution(1920, 1080);
     }
 
     // OnSinkWantsChanged is called when FrameGeneratorCapturer::AddOrUpdateSink
     // is called.
     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.
       if (wants.target_pixel_count &&
-          *wants.target_pixel_count <
-              wants.max_pixel_count.value_or(std::numeric_limits<int>::max())) {
+          *wants.target_pixel_count < wants.max_pixel_count) {
         // 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) {
+      } else if (wants.max_pixel_count < std::numeric_limits<int>::max()) {

[stefan-webrtc, 2017/03/21 15:37:36]

It's not clear to me what this change means. Can you explain?

[sprang_webrtc, 2017/03/21 15:59:18]

max_pixel_count is now a plain int instead of an rtc::Optional<int>
If no max is desired, it is set to maxint.

         // 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,
@@ skipping 223 matching lines @@
     uint32_t last_set_bitrate_kbps_;
     VideoSendStream* send_stream_;
     test::FrameGeneratorCapturer* frame_generator_;
     VideoEncoderConfig encoder_config_;
   } test;
 
   RunBaseTest(&test);
 }
 
 }  // namespace webrtc