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

Fix potential divide by zero in SimulcastEncoderAdapter

Browse Source 
Bug: webrtc:11453
Change-Id: I4119955d7a3cdc4099b8f0ab013e5e33ec38715f
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/171511
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Commit-Queue: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30866}
This commit is contained in:
Erik Språng
2020-03-24 12:00:00 +01:00
committed by Commit Bot
parent 5b6a4d8908
commit 01611ed3ac
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/engine/simulcast_encoder_adapter.cc
View File

@ -513,7 +513,8 @@ void SimulcastEncoderAdapter::SetRates(
} }
// Assign link allocation proportionally to spatial layer allocation. // Assign link allocation proportionally to spatial layer allocation.
if (parameters.bandwidth_allocation != DataRate::Zero()) { if (!parameters.bandwidth_allocation.IsZero() &&
parameters.bitrate.get_sum_bps() > 0) {
stream_parameters.bandwidth_allocation = stream_parameters.bandwidth_allocation =
DataRate::BitsPerSec((parameters.bandwidth_allocation.bps() * DataRate::BitsPerSec((parameters.bandwidth_allocation.bps() *
stream_parameters.bitrate.get_sum_bps()) / stream_parameters.bitrate.get_sum_bps()) /

25
media/engine/simulcast_encoder_adapter_unittest.cc
View File

@ -1364,6 +1364,31 @@ TEST_F(TestSimulcastEncoderAdapterFake, SetRateDistributesBandwithAllocation) {
} }
} }
TEST_F(TestSimulcastEncoderAdapterFake, CanSetZeroBitrateWithHeadroom) {
SimulcastTestFixtureImpl::DefaultSettings(
&codec_, static_cast<const int*>(kTestTemporalLayerProfile),
kVideoCodecVP8);
codec_.numberOfSimulcastStreams = 3;
rate_allocator_.reset(new SimulcastRateAllocator(codec_));
EXPECT_EQ(0, adapter_->InitEncode(&codec_, kSettings));
adapter_->RegisterEncodeCompleteCallback(this);
// Set allocated bitrate to 0, but keep (network) bandwidth allocation.
VideoEncoder::RateControlParameters rate_params;
rate_params.framerate_fps = 30;
rate_params.bandwidth_allocation = DataRate::KilobitsPerSec(600);
adapter_->SetRates(rate_params);
std::vector<MockVideoEncoder*> encoders = helper_->factory()->encoders();
ASSERT_EQ(3u, encoders.size());
for (size_t i = 0; i < 3; ++i) {
EXPECT_EQ(0u, encoders[i]->last_set_rates().bitrate.get_sum_bps());
}
}
TEST_F(TestSimulcastEncoderAdapterFake, SupportsSimulcast) { TEST_F(TestSimulcastEncoderAdapterFake, SupportsSimulcast) {
SimulcastTestFixtureImpl::DefaultSettings( SimulcastTestFixtureImpl::DefaultSettings(
&codec_, static_cast<const int*>(kTestTemporalLayerProfile), &codec_, static_cast<const int*>(kTestTemporalLayerProfile),