Add initial bitrate and frame resolution parameters to quality scaler.

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/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 kWidthVga = 640;
 static const int kHalfWidth = kWidth / 2;
 static const int kHeight = 1080;
+static const int kHeightVga = 480;
 static const int kFramerate = 30;
 static const int kLowQp = 15;
 static const int kNormalQp = 30;
 static const int kHighQp = 40;
 static const int kMaxQp = 56;
+static const int kDisabledBadQpThreshold = kMaxQp + 1;
+static const int kLowInitialBitrateKbps = 300;
 }  // namespace
 
 class QualityScalerTest : public ::testing::Test {
  public:
   // Temporal and spatial resolution.
   struct Resolution {
     int framerate;
     int width;
     int height;
   };
 
  protected:
   enum ScaleDirection {
     kKeepScaleAtHighQp,
     kScaleDown,
     kScaleDownAboveHighQp,
     kScaleUp
   };
   enum BadQualityMetric { kDropFrame, kReportLowQP };
 
   QualityScalerTest() {
     input_frame_.CreateEmptyFrame(kWidth, kHeight, kWidth, kHalfWidth,
                                   kHalfWidth);
-    qs_.Init(kMaxQp / QualityScaler::kDefaultLowQpDenominator, kHighQp, false);
+    qs_.Init(kMaxQp / QualityScaler::kDefaultLowQpDenominator, kHighQp, false,
+             0, 0, 0);
     qs_.ReportFramerate(kFramerate);
     qs_.OnEncodeFrame(input_frame_);
   }
 
   bool TriggerScale(ScaleDirection scale_direction) {
     qs_.OnEncodeFrame(input_frame_);
     int initial_width = qs_.GetScaledResolution().width;
     for (int i = 0; i < kFramerate * kNumSeconds; ++i) {
       switch (scale_direction) {
         case kScaleUp:
@@ skipping 229 matching lines @@
     res.height = qs_.GetScaledResolution().height;
   }
   return res;
 }
 
 void QualityScalerTest::VerifyQualityAdaptation(
     int initial_framerate,
     int seconds,
     bool expect_spatial_resize,
     bool expect_framerate_reduction) {
-  const int kDisabledBadQpThreshold = kMaxQp + 1;
   qs_.Init(kMaxQp / QualityScaler::kDefaultLowQpDenominator,
-           kDisabledBadQpThreshold, true);
+           kDisabledBadQpThreshold, true, 0, 0, 0);
   qs_.OnEncodeFrame(input_frame_);
   int init_width = qs_.GetScaledResolution().width;
   int init_height = qs_.GetScaledResolution().height;
 
   // Test reducing framerate by dropping frame continuously.
   QualityScalerTest::Resolution res =
       TriggerResolutionChange(kDropFrame, seconds, initial_framerate);
 
   if (expect_framerate_reduction) {
     EXPECT_LT(res.framerate, initial_framerate);
@@ skipping 45 matching lines @@
 TEST_F(QualityScalerTest, DoesNotDownscaleBelow2xDefaultMinDimensionsWidth) {
   DoesNotDownscaleFrameDimensions(
       2 * QualityScaler::kDefaultMinDownscaleDimension - 1, 1000);
 }
 
 TEST_F(QualityScalerTest, DoesNotDownscaleBelow2xDefaultMinDimensionsHeight) {
   DoesNotDownscaleFrameDimensions(
       1000, 2 * QualityScaler::kDefaultMinDownscaleDimension - 1);
 }
 
+TEST_F(QualityScalerTest, DownscaleToVgaOnLowInitialBitrate) {
+  qs_.Init(kMaxQp / QualityScaler::kDefaultLowQpDenominator,
+           kDisabledBadQpThreshold, true,
+           kLowInitialBitrateKbps, kWidth, kHeight);
+  qs_.OnEncodeFrame(input_frame_);
+  int init_width = qs_.GetScaledResolution().width;
+  int init_height = qs_.GetScaledResolution().height;
+  EXPECT_LE(init_width, kWidthVga);
+  EXPECT_LE(init_height, kHeightVga);
+}
+
 void QualityScalerTest::DownscaleEndsAt(int input_width,
                                         int input_height,
                                         int end_width,
                                         int end_height) {
   // Create a frame with 2x expected end width/height to verify that we can
   // scale down to expected end width/height.
   input_frame_.CreateEmptyFrame(input_width, input_height, input_width,
                                 (input_width + 1) / 2, (input_width + 1) / 2);
 
   int last_width = input_width;
@@ skipping 39 matching lines @@
   DownscaleEndsAt(1600, 800, 200, 100);
 }
 
 TEST_F(QualityScalerTest, RespectsMinResolutionHeight) {
   // Should end at 100x200, as height can't go lower.
   qs_.SetMinResolution(10, 200);
   DownscaleEndsAt(800, 1600, 100, 200);
 }
 
 }  // namespace webrtc