Move the QP scaling thresholds to the relevant encoders

webrtc/modules/video_coding/utility/quality_scaler_unittest.cc

 /*
  *  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.
  */
 
+#include "webrtc/common_types.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace webrtc {
 namespace {
 static const int kNumSeconds = 10;
 static const int kWidth = 1920;
 static const int kHeight = 1080;
 static const int kFramerate = 30;
@@ skipping 15 matching lines @@
  protected:
   enum ScaleDirection {
     kKeepScaleAtHighQp,
     kScaleDown,
     kScaleDownAboveHighQp,
     kScaleUp
   };
 
   QualityScalerTest() {
     input_frame_ = I420Buffer::Create(kWidth, kHeight);
-    qs_.Init(kLowQpThreshold, kHighQp, 0, kWidth, kHeight, kFramerate);
+    qs_.Init(kVideoCodecH264, 0, kWidth, kHeight, kFramerate, kLowQpThreshold,
+             kHighQp);
     qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   }
 
   bool TriggerScale(ScaleDirection scale_direction) {
     qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
     int initial_width = qs_.GetScaledResolution().width;
     for (int i = 0; i < kFramerate * kNumSeconds; ++i) {
       switch (scale_direction) {
         case kScaleUp:
           qs_.ReportQP(kLowQp);
@@ skipping 196 matching lines @@
 TEST_F(QualityScalerTest, DoesNotDownscaleBelow2xDefaultMinDimensionsHeight) {
   DoesNotDownscaleFrameDimensions(
       1000, 2 * kMinDownscaleDimension - 1);
 }
 
 TEST_F(QualityScalerTest, DownscaleToVgaOnLowInitialBitrate) {
   static const int kWidth720p = 1280;
   static const int kHeight720p = 720;
   static const int kInitialBitrateKbps = 300;
   input_frame_ = I420Buffer::Create(kWidth720p, kHeight720p);
-  qs_.Init(kLowQpThreshold, kDisabledBadQpThreshold, kInitialBitrateKbps,
-           kWidth720p, kHeight720p, kFramerate);
+  qs_.Init(kVideoCodecH264, kInitialBitrateKbps, kWidth720p, kHeight720p,
+           kFramerate, kLowQpThreshold, kDisabledBadQpThreshold);
   qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   int init_width = qs_.GetScaledResolution().width;
   int init_height = qs_.GetScaledResolution().height;
   EXPECT_EQ(640, init_width);
   EXPECT_EQ(360, init_height);
 }
 
 TEST_F(QualityScalerTest, DownscaleToQvgaOnLowerInitialBitrate) {
   static const int kWidth720p = 1280;
   static const int kHeight720p = 720;
   static const int kInitialBitrateKbps = 200;
   input_frame_ = I420Buffer::Create(kWidth720p, kHeight720p);
-  qs_.Init(kLowQpThreshold, kDisabledBadQpThreshold, kInitialBitrateKbps,
-           kWidth720p, kHeight720p, kFramerate);
+  qs_.Init(kVideoCodecH264, kInitialBitrateKbps, kWidth720p, kHeight720p,
+           kFramerate, kLowQpThreshold, kDisabledBadQpThreshold);
   qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   int init_width = qs_.GetScaledResolution().width;
   int init_height = qs_.GetScaledResolution().height;
   EXPECT_EQ(320, init_width);
   EXPECT_EQ(180, init_height);
 }
 
 TEST_F(QualityScalerTest, DownscaleAfterMeasuredSecondsThenSlowerBackUp) {
-  qs_.Init(kLowQpThreshold, kHighQp, 0, kWidth, kHeight, kFramerate);
+  qs_.Init(kVideoCodecH264, 0, kWidth, kHeight, kFramerate, kLowQpThreshold,
+           kHighQp);
   qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   QualityScaler::Resolution initial_res = qs_.GetScaledResolution();
 
   // Should not downscale if less than kMeasureSecondsDownscale seconds passed.
   for (int i = 0; i < kFramerate * kMeasureSecondsDownscale - 1; ++i) {
     qs_.ReportQP(kHighQp + 1);
     qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   }
   EXPECT_EQ(initial_res.width, qs_.GetScaledResolution().width);
   EXPECT_EQ(initial_res.height, qs_.GetScaledResolution().height);
@@ skipping 16 matching lines @@
 
   // Should upscale (back to initial) if kMeasureSecondsUpscale seconds passed
   // (add last frame).
   qs_.ReportQP(kLowQp);
   qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   EXPECT_EQ(initial_res.width, qs_.GetScaledResolution().width);
   EXPECT_EQ(initial_res.height, qs_.GetScaledResolution().height);
 }
 
 TEST_F(QualityScalerTest, UpscaleQuicklyInitiallyAfterMeasuredSeconds) {
-  qs_.Init(kLowQpThreshold, kHighQp, kLowInitialBitrateKbps, kWidth, kHeight,
-           kFramerate);
+  qs_.Init(kVideoCodecH264, kLowInitialBitrateKbps, kWidth, kHeight, kFramerate,
+           kLowQpThreshold, kHighQp);
   qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   QualityScaler::Resolution initial_res = qs_.GetScaledResolution();
 
   // Should not upscale if less than kMeasureSecondsFastUpscale seconds passed.
   for (int i = 0; i < kFramerate * kMeasureSecondsFastUpscale - 1; ++i) {
     qs_.ReportQP(kLowQp);
     qs_.OnEncodeFrame(input_frame_->width(), input_frame_->height());
   }
   EXPECT_EQ(initial_res.width, qs_.GetScaledResolution().width);
   EXPECT_EQ(initial_res.height, qs_.GetScaledResolution().height);
@@ skipping 41 matching lines @@
 
 TEST_F(QualityScalerTest, DownscalesFrom1280x720To320x180) {
   DownscaleEndsAt(1280, 720, 320, 180);
 }
 
 TEST_F(QualityScalerTest, DoesntDownscaleInitialQvga) {
   DownscaleEndsAt(320, 180, 320, 180);
 }
 
 }  // namespace webrtc