Set overuse detector max frame interval based on target frame rate.

webrtc/video/vie_encoder.h

Index: webrtc/video/vie_encoder.h
diff --git a/webrtc/video/vie_encoder.h b/webrtc/video/vie_encoder.h
index f2d7cfdae2084609589bb26b196a273483a457e0..78ba4a186ef80854ea4fb76a30675bf5e769f3bc 100644
--- a/webrtc/video/vie_encoder.h
+++ b/webrtc/video/vie_encoder.h
@@ -129,6 +129,10 @@ class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
   // These methods are protected for easier testing.
   void AdaptUp(AdaptReason reason) override;
   void AdaptDown(AdaptReason reason) override;
+  static CpuOveruseOptions GetCpuOveruseOptions(bool full_overuse_time);
+
+  void UpdateOveruseDetector(
+      std::unique_ptr<OveruseFrameDetector> overuse_detector);
 
  private:
   class ConfigureEncoderTask;
@@ -229,7 +233,8 @@ class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
   const VideoCodecType codec_type_;
 
   vcm::VideoSender video_sender_ ACCESS_ON(&encoder_queue_);
-  OveruseFrameDetector overuse_detector_ ACCESS_ON(&encoder_queue_);
+  std::unique_ptr<OveruseFrameDetector> overuse_detector_
+      ACCESS_ON(&encoder_queue_);
   std::unique_ptr<QualityScaler> quality_scaler_ ACCESS_ON(&encoder_queue_);
 
   SendStatisticsProxy* const stats_proxy_;
@@ -243,6 +248,9 @@ class ViEEncoder : public rtc::VideoSinkInterface<VideoFrame>,
   VideoEncoderConfig encoder_config_ ACCESS_ON(&encoder_queue_);
   std::unique_ptr<VideoBitrateAllocator> rate_allocator_
       ACCESS_ON(&encoder_queue_);
+  // The maximum frame rate of the current codec configuration, as determined
+  // at the last ReconfigureEncoder() call.
+  int max_framerate_ ACCESS_ON(&encoder_queue_);

[kthelgason, 2017/06/12 11:56:48]

we already store the VideoEncoderConfig. Isn't this info taken from there?

[sprang_webrtc, 2017/06/14 08:39:17]

You'd think so, but it actually doesn't (explicitly) hold the max framerate.
It's instead assigned by the VideoStreamFactoryInterface instance pointed to by
the VideoEncoderConfig. In the chrome case, that lived is the
EncoderStreamFactory in webrtcvideoengine2, and its maximum is set at
construction time from a constraint.

The alternative is to store the entire std::vector<webrtc::VideoStream> returned
by the factory...

 
   // Set when ConfigureEncoder has been called in order to lazy reconfigure the
   // encoder on the next frame.