Remove always-on options in OveruseFrameDetector.

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 20 matching lines @@
   virtual void OveruseDetected() = 0;
   // Called periodically when the system is not overused any longer.
   virtual void NormalUsage() = 0;
 
  protected:
   virtual ~CpuOveruseObserver() {}
 };
 
 struct CpuOveruseOptions {
   CpuOveruseOptions()
-      : enable_encode_usage_method(true),
-        low_encode_usage_threshold_percent(55),
+      : low_encode_usage_threshold_percent(55),
         high_encode_usage_threshold_percent(85),
-        enable_extended_processing_usage(true),
         frame_timeout_interval_ms(1500),
         min_frame_samples(120),
         min_process_count(3),
         high_threshold_consecutive_count(2) {}
 
-  // Method based on encode time of frames.
-  bool enable_encode_usage_method;
   int low_encode_usage_threshold_percent;  // Threshold for triggering underuse.
   int high_encode_usage_threshold_percent;  // Threshold for triggering overuse.
-  bool enable_extended_processing_usage;  // Include a larger time span (in
-                                          // addition to encode time) for
-                                          // measuring the processing time of a
-                                          // frame.
   // General settings.
   int frame_timeout_interval_ms;  // The maximum allowed interval between two
                                   // frames before resetting estimations.
   int min_frame_samples;  // The minimum number of frames required.
   int min_process_count;  // The number of initial process times required before
                           // triggering an overuse/underuse.
   int high_threshold_consecutive_count;  // The number of consecutive checks
                                          // above the high threshold before
                                          // triggering an overuse.
 };
@@ skipping 18 matching lines @@
  public:
   OveruseFrameDetector(Clock* clock,
                        const CpuOveruseOptions& options,
                        CpuOveruseObserver* overuse_observer,
                        CpuOveruseMetricsObserver* metrics_observer);
   ~OveruseFrameDetector();
 
   // Called for each captured frame.
   void FrameCaptured(int width, int height, int64_t capture_time_ms);
 
-  // Called for each encoded frame.
-  void FrameEncoded(int encode_time_ms);
-
   // Called for each sent frame.
   void FrameSent(int64_t capture_time_ms);
 
   // Only public for testing.
   int LastProcessingTimeMs() const;
   int FramesInQueue() const;
 
   // Implements Module.
   int64_t TimeUntilNextProcess() override;
   int32_t Process() override;
@@ skipping 57 matching lines @@
   const rtc::scoped_ptr<FrameQueue> frame_queue_ GUARDED_BY(crit_);
 
   rtc::ThreadChecker processing_thread_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_