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

webrtc/video/overuse_frame_detector.h

 /*
  *  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 50 matching lines @@
 // incoming frames. All methods must be called on a single task queue but it can
 // be created and destroyed on an arbitrary thread.
 // OveruseFrameDetector::StartCheckForOveruse  must be called to periodically
 // check for overuse.
 class OveruseFrameDetector {
  public:
   OveruseFrameDetector(const CpuOveruseOptions& options,
                        AdaptationObserverInterface* overuse_observer,
                        EncodedFrameObserver* encoder_timing_,
                        CpuOveruseMetricsObserver* metrics_observer);
-  ~OveruseFrameDetector();
+  virtual ~OveruseFrameDetector();
 
   // Start to periodically check for overuse.
   void StartCheckForOveruse();
 
   // StopCheckForOveruse must be called before destruction if
   // StartCheckForOveruse has been called.
   void StopCheckForOveruse();
 
+  // Defines the current maximum framerate targeted by the capturer. This is
+  // used to make sure the encode usage percent doesn't drop unduly if the
+  // capturer has quiet periods (for instance caused by screen capturers with
+  // variable capture rate depending on content updates), otherwise we might
+  // experience adaptation toggling.
+  virtual void OnTargetFramerateUpdated(int framerate_fps);
+
   // Called for each captured frame.
   void FrameCaptured(const VideoFrame& frame, int64_t time_when_first_seen_us);
 
   // Called for each sent frame.
   void FrameSent(uint32_t timestamp, int64_t time_sent_in_us);
 
  protected:
   void CheckForOveruse();  // Protected for test purposes.
 
  private:
@@ skipping 38 matching lines @@
   CpuOveruseMetricsObserver* const metrics_observer_;
   rtc::Optional<CpuOveruseMetrics> metrics_ GUARDED_BY(task_checker_);
 
   int64_t num_process_times_ GUARDED_BY(task_checker_);
 
   int64_t last_capture_time_us_ GUARDED_BY(task_checker_);
   int64_t last_processed_capture_time_us_ GUARDED_BY(task_checker_);
 
   // Number of pixels of last captured frame.
   int num_pixels_ GUARDED_BY(task_checker_);
+  int framerate_ GUARDED_BY(task_checker_);

[åsapersson, 2017/06/13 12:15:09]

maybe max_framerate_

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

Done.

   int64_t last_overuse_time_ms_ GUARDED_BY(task_checker_);
   int checks_above_threshold_ GUARDED_BY(task_checker_);
   int num_overuse_detections_ GUARDED_BY(task_checker_);
   int64_t last_rampup_time_ms_ GUARDED_BY(task_checker_);
   bool in_quick_rampup_ GUARDED_BY(task_checker_);
   int current_rampup_delay_ms_ GUARDED_BY(task_checker_);
 
   // TODO(asapersson): Can these be regular members (avoid separate heap
   // allocs)?
   const std::unique_ptr<SendProcessingUsage> usage_ GUARDED_BY(task_checker_);
   std::list<FrameTiming> frame_timing_ GUARDED_BY(task_checker_);
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_