Move the QP scaling thresholds to the relevant encoders

webrtc/modules/video_coding/utility/quality_scaler.h

Index: webrtc/modules/video_coding/utility/quality_scaler.h
diff --git a/webrtc/modules/video_coding/utility/quality_scaler.h b/webrtc/modules/video_coding/utility/quality_scaler.h
index c1ae50b06e138b365b190acb61c1a3a66bcc7e92..c7d215bb19e99ca7df29fd441ace5f581b8aac3f 100644
--- a/webrtc/modules/video_coding/utility/quality_scaler.h
+++ b/webrtc/modules/video_coding/utility/quality_scaler.h
@@ -11,6 +11,7 @@
 #ifndef WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
 #define WEBRTC_MODULES_VIDEO_CODING_UTILITY_QUALITY_SCALER_H_
 
+#include "webrtc/common_types.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/modules/video_coding/utility/moving_average.h"
 
@@ -23,12 +24,18 @@ class QualityScaler {
   };
 
   QualityScaler();
-  void Init(int low_qp_threshold,
-            int high_qp_threshold,
+  void Init(VideoCodecType codec_type,
             int initial_bitrate_kbps,
             int width,
             int height,
             int fps);
+  void Init(VideoCodecType codec_type,
+            int initial_bitrate_kbps,
+            int width,
+            int height,
+            int fps,
+            int highQpThreshold,

[pbos-webrtc, 2016/09/19 14:06:57]

hiqh_qp_threshold,
low_qp_threshold

+            int lowQpThreshold);
   void ReportFramerate(int framerate);
   void ReportQP(int qp);
   void ReportDroppedFrame();
@@ -38,15 +45,6 @@ class QualityScaler {
       const rtc::scoped_refptr<VideoFrameBuffer>& frame);
   int downscale_shift() const { return downscale_shift_; }
 
-  // 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 ClearSamples();
   void ScaleUp();