From d174d370fe8c7c36c068e130c841a6f87ef9f7d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85sa=20Persson?= Date: Wed, 25 Nov 2020 14:19:35 +0100 Subject: [PATCH] Only call balanced_settings_.CanAdaptUpResolution if DegradationPreference::BALANCED. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: none Change-Id: If76a3413bfdf359f79d94691b841d4056d91a80b Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/195327 Reviewed-by: Evan Shrubsole Commit-Queue: Åsa Persson Cr-Commit-Position: refs/heads/master@{#32699} --- video/adaptation/balanced_constraint.cc | 26 +++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/video/adaptation/balanced_constraint.cc b/video/adaptation/balanced_constraint.cc index fb455193f3..b4926a4a26 100644 --- a/video/adaptation/balanced_constraint.cc +++ b/video/adaptation/balanced_constraint.cc @@ -39,18 +39,20 @@ bool BalancedConstraint::IsAdaptationUpAllowed( // Don't adapt if BalancedDegradationSettings applies and determines this will // exceed bitrate constraints. if (degradation_preference_provider_->degradation_preference() == - DegradationPreference::BALANCED && - !balanced_settings_.CanAdaptUp(input_state.video_codec_type(), - input_state.frame_size_pixels().value(), - encoder_target_bitrate_bps_.value_or(0))) { - return false; - } - if (DidIncreaseResolution(restrictions_before, restrictions_after) && - !balanced_settings_.CanAdaptUpResolution( - input_state.video_codec_type(), - input_state.frame_size_pixels().value(), - encoder_target_bitrate_bps_.value_or(0))) { - return false; + DegradationPreference::BALANCED) { + if (!balanced_settings_.CanAdaptUp( + input_state.video_codec_type(), + input_state.frame_size_pixels().value(), + encoder_target_bitrate_bps_.value_or(0))) { + return false; + } + if (DidIncreaseResolution(restrictions_before, restrictions_after) && + !balanced_settings_.CanAdaptUpResolution( + input_state.video_codec_type(), + input_state.frame_size_pixels().value(), + encoder_target_bitrate_bps_.value_or(0))) { + return false; + } } return true; }