Index: webrtc/video/vie_encoder.cc |
diff --git a/webrtc/video/vie_encoder.cc b/webrtc/video/vie_encoder.cc |
index 219b8ea7af62d8d16c6d949a71bf8f677eb327c4..ab306c1eae2dc7adfea2b3f060a6d2365107ad07 100644 |
--- a/webrtc/video/vie_encoder.cc |
+++ b/webrtc/video/vie_encoder.cc |
@@ -536,14 +536,15 @@ void ViEEncoder::ConfigureQualityScaler() { |
const bool degradation_preference_allows_scaling = |
degradation_preference_ == DegradationPreference::kMaintainFramerate || |
degradation_preference_ == DegradationPreference::kBalanced; |
+ const bool quality_scaling_allowed = |
+ degradation_preference_allows_scaling && scaling_settings.enabled; |
const std::vector<int>& scale_counters = GetScaleCounters(); |
stats_proxy_->SetResolutionRestrictionStats( |
- degradation_preference_allows_scaling, scale_counters[kCpu] > 0, |
- scale_counters[kQuality]); |
+ degradation_preference_allows_scaling, quality_scaling_allowed, |
+ scale_counters[kCpu] > 0, scale_counters[kQuality]); |
- if (degradation_preference_allows_scaling && |
- scaling_settings.enabled) { |
+ if (quality_scaling_allowed) { |
// Abort if quality scaler has already been configured. |
if (quality_scaler_.get() != nullptr) |
return; |