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

Periodically update channel parameters and send TargetBitrate message.

Browse Source 
Currently, parameters are periodically updated, but the TargetBitrate
message is only sent if a new bitrate is set. It should be sent
periodically to indicate the signaled bitrate is valid and to prevent
stale values due to loss of RTCP packets.

BUG=webrtc:6897

Review-Url: https://codereview.webrtc.org/2616393003
Cr-Commit-Position: refs/heads/master@{#16096}
This commit is contained in:
sprang
2017-01-16 06:24:02 -08:00
committed by Commit bot
parent 84abeb1d37
commit 57c2fff361
5 changed files with 63 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
webrtc/modules/video_coding/video_sender_unittest.cc
View File

@ -317,22 +317,6 @@ TEST_F(TestVideoSenderWithMockEncoder, TestSetRate) {
AddFrame();
clock_.AdvanceTimeMilliseconds(kFrameIntervalMs);
// Add enough frames so that input frame rate will be updated.
const int kFramesToSend =
(VCMProcessTimer::kDefaultProcessIntervalMs / kFrameIntervalMs) + 1;
for (int i = 0; i < kFramesToSend; ++i) {
AddFrame();
clock_.AdvanceTimeMilliseconds(kFrameIntervalMs);
}
EXPECT_CALL(encoder_,
SetRateAllocation(new_rate_allocation, kActualFrameRate))
.Times(1)
.WillOnce(Return(0));
sender_->Process();
AddFrame();
// Expect no call to encoder_.SetRates if the new bitrate is zero.
EXPECT_CALL(encoder_, SetRateAllocation(_, _)).Times(0);
sender_->SetChannelParameters(0, 0, 200, rate_allocator_.get(), nullptr);
@ -376,23 +360,6 @@ TEST_F(TestVideoSenderWithMockEncoder, TestEncoderParametersForInternalSource) {
rate_allocator_.get(), nullptr);
}
TEST_F(TestVideoSenderWithMockEncoder, EncoderFramerateUpdatedViaProcess) {
sender_->SetChannelParameters(settings_.startBitrate * 1000, 0, 200,
rate_allocator_.get(), nullptr);
const int64_t kRateStatsWindowMs = 2000;
const uint32_t kInputFps = 20;
int64_t start_time = clock_.TimeInMilliseconds();
while (clock_.TimeInMilliseconds() < start_time + kRateStatsWindowMs) {
AddFrame();
clock_.AdvanceTimeMilliseconds(1000 / kInputFps);
}
EXPECT_CALL(encoder_, SetRateAllocation(_, kInputFps))
.Times(1)
.WillOnce(Return(0));
sender_->Process();
AddFrame();
}
TEST_F(TestVideoSenderWithMockEncoder,
NoRedundantSetChannelParameterOrSetRatesCalls) {
const uint8_t kLossRate = 4;
@ -412,13 +379,7 @@ TEST_F(TestVideoSenderWithMockEncoder,
AddFrame();
clock_.AdvanceTimeMilliseconds(1000 / kInputFps);
}
// After process, input framerate should be updated but not ChannelParameters
// as they are the same as before.
EXPECT_CALL(encoder_, SetRateAllocation(_, kInputFps))
.Times(1)
.WillOnce(Return(0));
sender_->Process();
AddFrame();
// Call to SetChannelParameters with changed bitrate should call encoder
// SetRates but not encoder SetChannelParameters (that are unchanged).
uint32_t new_bitrate_bps = 2 * settings_.startBitrate * 1000;