Remove avg encode time from CpuOveruseMetric struct and use value from OnEncodedFrame instead.

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 49 matching lines @@
                                   // 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.
 };
 
 struct CpuOveruseMetrics {
-  CpuOveruseMetrics()
-      : avg_encode_time_ms(-1),
-        encode_usage_percent(-1) {}
+  CpuOveruseMetrics() : encode_usage_percent(-1) {}
 
-  int avg_encode_time_ms;    // Average encode time in ms.
   int encode_usage_percent;  // 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;
 };
 
@@ skipping 19 matching lines @@
 
   // Only public for testing.
   int LastProcessingTimeMs() const;
   int FramesInQueue() const;
 
   // Implements Module.
   int64_t TimeUntilNextProcess() override;
   int32_t Process() override;
 
  private:
-  class EncodeTimeAvg;
   class SendProcessingUsage;
   class FrameQueue;
 
   void UpdateCpuOveruseMetrics() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // TODO(asapersson): This method is only used on one thread, so it shouldn't
   // need a guard.
   void AddProcessingTime(int elapsed_ms) EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   // Only called on the processing thread.
@@ skipping 30 matching lines @@
 
   // These seven members are only accessed on the processing thread.
   int64_t next_process_time_;
   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_;
 
-  int64_t last_encode_sample_ms_;  // Only accessed by one thread.
   int64_t last_sample_time_ms_;    // Only accessed by one thread.
 
   // TODO(asapersson): Can these be regular members (avoid separate heap
   // allocs)?
-  const rtc::scoped_ptr<EncodeTimeAvg> encode_time_ GUARDED_BY(crit_);
   const rtc::scoped_ptr<SendProcessingUsage> usage_ GUARDED_BY(crit_);
   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_ENGINE_OVERUSE_FRAME_DETECTOR_H_