commit fda496a31e5c4d0aac98d3309eb288495748ba8f
author sprang <sprang@webrtc.org> Thu Jun 15 11:21:07 2017
committer Commit Bot <commit-bot@chromium.org> Thu Jun 15 11:21:07 2017
tree 3d5d7abe283b60c47efe524a9543ca0b04fbd6f9
parent 19e087fc91453b761b6b56ba84e7c9c5fafd9e8e

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

Currently there is a hard limit for the estimated captured frame
interval of 45ms. As the encoder utilization is calculated as
(input frame interval)/(encode time), overuse signals can be triggered
even though there is plenty of time to go around if the fps is low.

However, in order to avoid falsly estimating low encode usage in case
the capturer has a dynamic frame rate, set the frame interval based on
the actual current max framerate.

BUG=webrtc:4172

Review-Url: https://codereview.webrtc.org/2918143003
Cr-Commit-Position: refs/heads/master@{#18610}

webrtc/video/overuse_frame_detector.h

diff --git a/webrtc/video/overuse_frame_detector.h b/webrtc/video/overuse_frame_detector.h
index 2fb3104..29efa16 100644
--- a/webrtc/video/overuse_frame_detector.h
+++ b/webrtc/video/overuse_frame_detector.h
@@ -68,7 +68,7 @@
                        AdaptationObserverInterface* overuse_observer,
                        EncodedFrameObserver* encoder_timing_,
                        CpuOveruseMetricsObserver* metrics_observer);
-  ~OveruseFrameDetector();
+  virtual ~OveruseFrameDetector();
 
   // Start to periodically check for overuse.
   void StartCheckForOveruse();
@@ -77,6 +77,13 @@
   // 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);
 
@@ -135,6 +142,7 @@
 
   // Number of pixels of last captured frame.
   int num_pixels_ GUARDED_BY(task_checker_);
+  int max_framerate_ GUARDED_BY(task_checker_);
   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_);