Move usage of QualityScaler to ViEEncoder.

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.
  */
 
 #ifndef WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
 #define WEBRTC_VIDEO_OVERUSE_FRAME_DETECTOR_H_
 
 #include <list>
 #include <memory>
 
 #include "webrtc/base/analytics/exp_filter.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/optional.h"
 #include "webrtc/base/sequenced_task_checker.h"
 #include "webrtc/base/task_queue.h"
 #include "webrtc/base/thread_annotations.h"
+#include "webrtc/modules/video_coding/utility/quality_scaler.h"
 
 namespace webrtc {
 
 class Clock;
 class EncodedFrameObserver;
 class VideoFrame;
 
-// CpuOveruseObserver is called when a system overuse is detected and
-// VideoEngine cannot keep up the encoding frequency.
-class CpuOveruseObserver {
- public:
-  // Called as soon as an overuse is detected.
-  virtual void OveruseDetected() = 0;
-  // Called periodically when the system is not overused any longer.
-  virtual void NormalUsage() = 0;
-
- protected:
-  virtual ~CpuOveruseObserver() {}
-};
-
 struct CpuOveruseOptions {
   CpuOveruseOptions();
 
   int low_encode_usage_threshold_percent;  // Threshold for triggering underuse.
   int high_encode_usage_threshold_percent;  // Threshold for triggering overuse.
   // 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
@@ skipping 19 matching lines @@
 
 // Use to detect system overuse based on the send-side processing time of
 // 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(Clock* clock,
                        const CpuOveruseOptions& options,
-                       CpuOveruseObserver* overuse_observer,
+                       ScalingObserverInterface* overuse_observer,
                        EncodedFrameObserver* encoder_timing_,
                        CpuOveruseMetricsObserver* metrics_observer);
   ~OveruseFrameDetector();
 
   // Start to periodically check for overuse.
   void StartCheckForOveruse();
 
   // StopCheckForOveruse must be called before destruction if
   // StartCheckForOveruse has been called.
   void StopCheckForOveruse();
@@ skipping 31 matching lines @@
 
   void ResetAll(int num_pixels);
 
   rtc::SequencedTaskChecker task_checker_;
   // Owned by the task queue from where StartCheckForOveruse is called.
   CheckOveruseTask* check_overuse_task_;
 
   const CpuOveruseOptions options_;
 
   // Observer getting overuse reports.
-  CpuOveruseObserver* const observer_;
+  ScalingObserverInterface* const observer_;
   EncodedFrameObserver* const encoder_timing_;
 
   // Stats metrics.
   CpuOveruseMetricsObserver* const metrics_observer_;
   rtc::Optional<CpuOveruseMetrics> metrics_ GUARDED_BY(task_checker_);
   Clock* const clock_;
 
   int64_t num_process_times_ GUARDED_BY(task_checker_);
 
   int64_t last_capture_time_ms_ GUARDED_BY(task_checker_);
@@ skipping 12 matching lines @@
   // 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_