Remove unused overuse detection metric (capture jitter).

webrtc/video_engine/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_capture_jitter_method(false),
-        low_capture_jitter_threshold_ms(20.0f),
-        high_capture_jitter_threshold_ms(30.0f),
-        enable_encode_usage_method(true),
+      : enable_encode_usage_method(true),
         low_encode_usage_threshold_percent(55),
         high_encode_usage_threshold_percent(85),
-        low_encode_time_rsd_threshold(-1),
-        high_encode_time_rsd_threshold(-1),
         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 inter-arrival jitter of captured frames.
-  bool enable_capture_jitter_method;
-  float low_capture_jitter_threshold_ms;  // Threshold for triggering underuse.
-  float high_capture_jitter_threshold_ms; // Threshold for triggering overuse.
   // 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.
-  // TODO(asapersson): Remove options, not used.
-  int low_encode_time_rsd_threshold;   // Additional threshold for triggering
-                                       // underuse (used in addition to
-                                       // threshold above if configured).
-  int high_encode_time_rsd_threshold;  // Additional threshold for triggering
-                                       // overuse (used in addition to
-                                       // threshold above if configured).
   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.
-
-  bool Equals(const CpuOveruseOptions& o) const {
-    return enable_capture_jitter_method == o.enable_capture_jitter_method &&
-        low_capture_jitter_threshold_ms == o.low_capture_jitter_threshold_ms &&
-        high_capture_jitter_threshold_ms ==
-        o.high_capture_jitter_threshold_ms &&
-        enable_encode_usage_method == o.enable_encode_usage_method &&
-        low_encode_usage_threshold_percent ==
-        o.low_encode_usage_threshold_percent &&
-        high_encode_usage_threshold_percent ==
-        o.high_encode_usage_threshold_percent &&
-        low_encode_time_rsd_threshold == o.low_encode_time_rsd_threshold &&
-        high_encode_time_rsd_threshold == o.high_encode_time_rsd_threshold &&
-        enable_extended_processing_usage ==
-        o.enable_extended_processing_usage &&
-        frame_timeout_interval_ms == o.frame_timeout_interval_ms &&
-        min_frame_samples == o.min_frame_samples &&
-        min_process_count == o.min_process_count &&
-        high_threshold_consecutive_count == o.high_threshold_consecutive_count;
-  }
 };
 
 struct CpuOveruseMetrics {
   CpuOveruseMetrics()
-      : capture_jitter_ms(-1),
-        avg_encode_time_ms(-1),
+      : avg_encode_time_ms(-1),
         encode_usage_percent(-1) {}
 
-  int capture_jitter_ms;  // The current estimated jitter in ms based on
-                          // incoming captured frames.
   int avg_encode_time_ms;   // The average encode time in ms.
   int encode_usage_percent; // The average encode time divided by the average
                             // time difference between incoming captured frames.
 };
 
 class CpuOveruseMetricsObserver {
  public:
   virtual ~CpuOveruseMetricsObserver() {}
   virtual void CpuOveruseMetricsUpdated(const CpuOveruseMetrics& metrics) = 0;
 };
 
-// TODO(pbos): Move this somewhere appropriate.
-class Statistics {
- public:
-  explicit Statistics(const CpuOveruseOptions& options);
 
-  void AddSample(float sample_ms);
-  void Reset();
-
-  float Mean() const;
-  float StdDev() const;
-  uint64_t Count() const;
-
- private:
-  float InitialMean() const;
-  float InitialVariance() const;
-
-  float sum_;
-  uint64_t count_;
-  const CpuOveruseOptions options_;
-  rtc::scoped_ptr<rtc::ExpFilter> filtered_samples_;
-  rtc::scoped_ptr<rtc::ExpFilter> filtered_variance_;
-};
-
-// Use to detect system overuse based on jitter in incoming frames.
+// Use to detect system overuse based on the send-side processing time of
+// incoming frames.
 class OveruseFrameDetector : public Module {
  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);
@@ skipping 47 matching lines @@
   CpuOveruseObserver* const observer_;
 
   // Stats metrics.
   CpuOveruseMetricsObserver* const metrics_observer_;
   CpuOveruseMetrics metrics_ GUARDED_BY(crit_);
 
   Clock* const clock_;
   int64_t next_process_time_;  // Only accessed on the processing thread.
   int64_t num_process_times_ GUARDED_BY(crit_);
 
-  Statistics capture_deltas_ GUARDED_BY(crit_);
   int64_t last_capture_time_ GUARDED_BY(crit_);
 
   // These six members are only accessed on the processing thread.
   int64_t last_overuse_time_;
   int checks_above_threshold_;
   int num_overuse_detections_;
 
   int64_t last_rampup_time_;
   bool in_quick_rampup_;
   int current_rampup_delay_ms_;
@@ skipping 12 matching lines @@
   int64_t last_sample_time_ms_;  // Only accessed by one thread.
 
   rtc::ThreadChecker processing_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(OveruseFrameDetector);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_ENGINE_OVERUSE_FRAME_DETECTOR_H_