admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove bitrate cap for AdaptiveVideoSource and increase other caps to 25 Mbps.

Browse Source 
AdaptiveVideoSource is used in testing/simulations of the bandwidth estimator.

Nada's reaction to delay depends on the current bitrate and the configured max rate in a non-intuituve way. Increase the starting bitrate to compensate for the increased max bitrate. This is only used in unit tests.

BUG=webrtc:6807

# Presubmit warns about a lint error in bwe.h that's unrelated to my change. Fixing it is beyond the scope of this CL.
NOPRESUBMIT=true

Review-Url: https://codereview.webrtc.org/2542843003
Cr-Commit-Position: refs/heads/master@{#15364}
This commit is contained in:
terelius 2016-12-01 07:29:09 -08:00 committed by Commit bot
parent 2d9c877c64
commit 182e4a4aff
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webrtc/modules/remote_bitrate_estimator/test/bwe.h
View File

@ -110,7 +110,7 @@ class LinkedSet {
};
const int kMinBitrateKbps = 10;
const int kMaxBitrateKbps = 2500;
const int kMaxBitrateKbps = 25000;
class BweSender : public Module {
public:

2
webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.cc
View File

@ -765,7 +765,7 @@ AdaptiveVideoSource::AdaptiveVideoSource(int flow_id,
}
void AdaptiveVideoSource::SetBitrateBps(int bitrate_bps) {
bits_per_second_ = std::min(bitrate_bps, 2500000);
bits_per_second_ = bitrate_bps;
frame_size_bytes_ = (bits_per_second_ / 8 * frame_period_ms_ + 500) / 1000;
}

2
webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
View File

@ -228,7 +228,7 @@ TEST_F(NadaSenderSideTest, GradualRateUpdate) {
const int64_t kDeltaSMs = 20;
const int64_t kRefSignalMs = 20;
const int64_t kOneWayDelayMs = 50;
int original_bitrate = 2 * NadaBweSender::kMinNadaBitrateKbps;
int original_bitrate = 5 * NadaBweSender::kMinNadaBitrateKbps;
size_t receiving_rate = static_cast<size_t>(original_bitrate);
int64_t send_time_ms = nada_sender_.NowMs() - kOneWayDelayMs;