generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ensure that the start bitrate can be set multiple times.

Browse Source 
If the start bitrate is set twice, it will be set to the sum of the start
bitrates of the currently registered bitrate observers, or left unchanged
if the current estimate actually is greater than the sum.

BUG=3503
R=henrik.lundin@webrtc.org, pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15839004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6491 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2014-06-19 12:13:00 +00:00
parent 496a98463b
commit 077593b805
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/modules/bitrate_controller/bitrate_controller_impl.cc
View File

@ -139,6 +139,21 @@ void BitrateControllerImpl::SetBitrateObserver(
it->second->start_bitrate_ = start_bitrate; it->second->start_bitrate_ = start_bitrate;
it->second->min_bitrate_ = min_bitrate; it->second->min_bitrate_ = min_bitrate;
it->second->max_bitrate_ = max_bitrate; it->second->max_bitrate_ = max_bitrate;
// Set the send-side bandwidth to the max of the sum of start bitrates and
// the current estimate, so that if the user wants to immediately use more
// bandwidth, that can be enforced.
uint32_t sum_start_bitrate = 0;
BitrateObserverConfList::iterator it;
for (it = bitrate_observers_.begin(); it != bitrate_observers_.end();
++it) {
sum_start_bitrate += it->second->start_bitrate_;
}
uint32_t current_estimate;
uint8_t loss;
uint32_t rtt;
bandwidth_estimation_.CurrentEstimate(&current_estimate, &loss, &rtt);
bandwidth_estimation_.SetSendBitrate(std::max(sum_start_bitrate,
current_estimate));
} else { } else {
// Add new settings. // Add new settings.
bitrate_observers_.push_back(BitrateObserverConfiguration(observer, bitrate_observers_.push_back(BitrateObserverConfiguration(observer,
@ -159,12 +174,10 @@ void BitrateControllerImpl::SetBitrateObserver(
} }
void BitrateControllerImpl::UpdateMinMaxBitrate() { void BitrateControllerImpl::UpdateMinMaxBitrate() {
uint32_t sum_start_bitrate = 0;
uint32_t sum_min_bitrate = 0; uint32_t sum_min_bitrate = 0;
uint32_t sum_max_bitrate = 0; uint32_t sum_max_bitrate = 0;
BitrateObserverConfList::iterator it; BitrateObserverConfList::iterator it;
for (it = bitrate_observers_.begin(); it != bitrate_observers_.end(); ++it) { for (it = bitrate_observers_.begin(); it != bitrate_observers_.end(); ++it) {
sum_start_bitrate += it->second->start_bitrate_;
sum_min_bitrate += it->second->min_bitrate_; sum_min_bitrate += it->second->min_bitrate_;
sum_max_bitrate += it->second->max_bitrate_; sum_max_bitrate += it->second->max_bitrate_;
} }

18
webrtc/modules/bitrate_controller/bitrate_controller_unittest.cc
View File

@ -83,6 +83,24 @@ TEST_F(BitrateControllerTest, Basic) {
controller_->RemoveBitrateObserver(&bitrate_observer); controller_->RemoveBitrateObserver(&bitrate_observer);
} }
TEST_F(BitrateControllerTest, UpdatingBitrateObserver) {
TestBitrateObserver bitrate_observer;
controller_->SetBitrateObserver(&bitrate_observer, 200000, 100000, 1500000);
clock_.AdvanceTimeMilliseconds(25);
controller_->Process();
EXPECT_EQ(200000u, bitrate_observer.last_bitrate_);
controller_->SetBitrateObserver(&bitrate_observer, 1500000, 100000, 1500000);
clock_.AdvanceTimeMilliseconds(25);
controller_->Process();
EXPECT_EQ(1500000u, bitrate_observer.last_bitrate_);
controller_->SetBitrateObserver(&bitrate_observer, 500000, 100000, 1500000);
clock_.AdvanceTimeMilliseconds(25);
controller_->Process();
EXPECT_EQ(1500000u, bitrate_observer.last_bitrate_);
}
TEST_F(BitrateControllerTest, OneBitrateObserverOneRtcpObserver) { TEST_F(BitrateControllerTest, OneBitrateObserverOneRtcpObserver) {
TestBitrateObserver bitrate_observer; TestBitrateObserver bitrate_observer;
controller_->SetBitrateObserver(&bitrate_observer, 200000, 100000, 300000); controller_->SetBitrateObserver(&bitrate_observer, 200000, 100000, 300000);