zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "In RtpBitrateConfigurator ignore new parameters when set to default values."

Browse Source 
This reverts commit bcbdeedd432198c3d48effb2162af6344d885b14.

Reason for revert: Speculative revert after a perf regression.

Original change's description:
> In RtpBitrateConfigurator ignore new parameters when set to default values.
> 
> Bug: webrtc:11263
> Change-Id: Ia7539c7c142b059d0295849b916439bb647f112d
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/162207
> Reviewed-by: Sebastian Jansson <srte@webrtc.org>
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#30191}

TBR=danilchap@webrtc.org,srte@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:11263
Change-Id: I17804655465b27523c462d2aba44519c820b8e04
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165687
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30213}
This commit is contained in:
Mirko Bonadei
2020-01-10 15:34:49 +00:00
committed by Commit Bot
parent b42aeaa3fb
commit b408bb7b95
2 changed files with 2 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
call/rtp_bitrate_configurator.cc
View File

@ -67,12 +67,8 @@ RtpBitrateConfigurator::UpdateWithSdpParameters(
bitrate_config.start_bitrate_bps !=
base_bitrate_config_.start_bitrate_bps) {
new_start.emplace(bitrate_config.start_bitrate_bps);
base_bitrate_config_.start_bitrate_bps = bitrate_config.start_bitrate_bps;
}
if (bitrate_config.min_bitrate_bps > 0)
base_bitrate_config_.min_bitrate_bps = bitrate_config.min_bitrate_bps;
if (bitrate_config.max_bitrate_bps > 0)
base_bitrate_config_.max_bitrate_bps = bitrate_config.max_bitrate_bps;
base_bitrate_config_ = bitrate_config;
return UpdateConstraints(new_start);
}

19
call/rtp_bitrate_configurator_unittest.cc
View File

@ -27,7 +27,7 @@ class RtpBitrateConfiguratorTest : public ::testing::Test {
absl::optional<int> max_bitrate_bps) {
absl::optional<BitrateConstraints> result =
configurator_->UpdateWithSdpParameters(bitrate_config);
ASSERT_TRUE(result.has_value());
EXPECT_TRUE(result.has_value());
if (start_bitrate_bps.has_value())
EXPECT_EQ(result->start_bitrate_bps, start_bitrate_bps);
if (min_bitrate_bps.has_value())
@ -231,23 +231,6 @@ TEST_F(RtpBitrateConfiguratorTest, NewConfigWithNoChangesDoesNotCallNewConfig) {
EXPECT_FALSE(configurator_->UpdateWithSdpParameters(config2).has_value());
}
TEST_F(RtpBitrateConfiguratorTest,
NewConfigWithUnsetMinAndMaxDoesNotCallNewConfig) {
BitrateConstraints config1;
config1.min_bitrate_bps = 100'000;
config1.start_bitrate_bps = 1'000;
config1.max_bitrate_bps = 1'000'000;
BitrateConstraints config2;
config2.min_bitrate_bps = 0;
config2.start_bitrate_bps = -1;
config2.max_bitrate_bps = -1;
configurator_->UpdateWithSdpParameters(config1);
// The second call should return nothing because it doesn't change any values.
EXPECT_EQ(configurator_->UpdateWithSdpParameters(config2), absl::nullopt);
}
// If config changes the max, but not the effective max,
// new config shouldn't be returned, to avoid unnecessary encoder
// reconfigurations.