From 162d39a53e1baff7c1ce93a547dd5311de968dea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=85sa=20Persson?= <asapersson@webrtc.org>
Date: Fri, 7 Aug 2020 17:09:38 +0200
Subject: [PATCH] Update settings for balanced degradation.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Configure fps_diff (if input fps - requested fps is less than the
fps_diff -> new adaptation triggered).

Bug: webrtc:7607
Change-Id: I59f10ae4fc7c4f3a09613524a9566f7c45074591
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/181077
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#31890}
---
 rtc_base/experiments/balanced_degradation_settings.cc       | 6 +++---
 .../experiments/balanced_degradation_settings_unittest.cc   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/rtc_base/experiments/balanced_degradation_settings.cc b/rtc_base/experiments/balanced_degradation_settings.cc
index 7a1e8913cc..d061597f70 100644
--- a/rtc_base/experiments/balanced_degradation_settings.cc
+++ b/rtc_base/experiments/balanced_degradation_settings.cc
@@ -34,11 +34,11 @@ std::vector<BalancedDegradationSettings::Config> DefaultConfigs() {
            {0, 0, 0, 0, 0},
            {0, 0, 0, 0, 0},
            {0, 0, 0, 0, 0}},
-          {480 * 270,
+          {480 * 360,
            10,
            0,
            0,
-           BalancedDegradationSettings::kNoFpsDiff,
+           1,
            {0, 0, 0, 0, 0},
            {0, 0, 0, 0, 0},
            {0, 0, 0, 0, 0},
@@ -48,7 +48,7 @@ std::vector<BalancedDegradationSettings::Config> DefaultConfigs() {
            15,
            0,
            0,
-           BalancedDegradationSettings::kNoFpsDiff,
+           1,
            {0, 0, 0, 0, 0},
            {0, 0, 0, 0, 0},
            {0, 0, 0, 0, 0},
diff --git a/rtc_base/experiments/balanced_degradation_settings_unittest.cc b/rtc_base/experiments/balanced_degradation_settings_unittest.cc
index 5721445ee4..92833ee98c 100644
--- a/rtc_base/experiments/balanced_degradation_settings_unittest.cc
+++ b/rtc_base/experiments/balanced_degradation_settings_unittest.cc
@@ -34,11 +34,11 @@ void VerifyIsDefault(
                               {0, 0, 0, 0, 0},
                               {0, 0, 0, 0, 0}},
                           BalancedDegradationSettings::Config{
-                              480 * 270,
+                              480 * 360,
                               10,
                               0,
                               0,
-                              BalancedDegradationSettings::kNoFpsDiff,
+                              1,
                               {0, 0, 0, 0, 0},
                               {0, 0, 0, 0, 0},
                               {0, 0, 0, 0, 0},
@@ -49,7 +49,7 @@ void VerifyIsDefault(
                               15,
                               0,
                               0,
-                              BalancedDegradationSettings::kNoFpsDiff,
+                              1,
                               {0, 0, 0, 0, 0},
                               {0, 0, 0, 0, 0},
                               {0, 0, 0, 0, 0},