Refactor QualityScaler and MovingAverage

webrtc/modules/video_coding/utility/quality_scaler.h

 /*
  *  Copyright (c) 2014 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 30 matching lines @@
   // QP is obtained from VP8-bitstream for HW, so the QP corresponds to the
   // bitstream range of [0, 127] and not the user-level range of [0,63].
   static const int kLowVp8QpThreshold;
   static const int kBadVp8QpThreshold;
 
   // H264 QP is in the range [0, 51].
   static const int kLowH264QpThreshold;
   static const int kBadH264QpThreshold;
 
  private:
-  void AdjustScale(bool up);
-  void UpdateTargetResolution(int frame_width, int frame_height);
   void ClearSamples();
-  void UpdateSampleCounts();
+  void ScaleUp();
+  void ScaleDown();
+  void UpdateTargetResolution(int width, int height);
 
   I420BufferPool pool_;
 
   size_t num_samples_downscale_;
   size_t num_samples_upscale_;
-  int measure_seconds_upscale_;
-  MovingAverage<int> average_qp_upscale_;
-  MovingAverage<int> average_qp_downscale_;
+  bool fast_rampup_;
+  MovingAverage average_qp_;
+  MovingAverage framedrop_percent_;
 
-  int framerate_;
   int low_qp_threshold_;
   int high_qp_threshold_;
-  MovingAverage<int> framedrop_percent_;
-  Resolution res_;
+  Resolution target_res_;
 
   int downscale_shift_;
+  int maximum_shift_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_