diff options
author | Chih-hung Hsieh <chh@google.com> | 2016-01-20 17:50:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-01-20 17:50:13 +0000 |
commit | b3cb8ab4ede8bb77f0bdef2715efc2c1e6267072 (patch) | |
tree | 28c4cf735dd5bd9cc8f1ccd06fff8a173b20d1cb /webrtc/modules/bitrate_controller/bitrate_allocator.cc | |
parent | a4acd9d6bc9b3b033d7d274316e75ee067df8d20 (diff) | |
parent | 9a337512d97e37afc142dee4fd50a41b741a87d2 (diff) | |
download | webrtc-nougat-mr2.2-release.tar.gz |
Merge "Merge upstream SHA 04cb763"android-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-cts-7.0_r9android-cts-7.0_r8android-cts-7.0_r7android-cts-7.0_r6android-cts-7.0_r5android-cts-7.0_r4android-cts-7.0_r33android-cts-7.0_r32android-cts-7.0_r31android-cts-7.0_r30android-cts-7.0_r3android-cts-7.0_r29android-cts-7.0_r28android-cts-7.0_r27android-cts-7.0_r26android-cts-7.0_r25android-cts-7.0_r24android-cts-7.0_r23android-cts-7.0_r22android-cts-7.0_r21android-cts-7.0_r20android-cts-7.0_r2android-cts-7.0_r19android-cts-7.0_r18android-cts-7.0_r17android-cts-7.0_r16android-cts-7.0_r15android-cts-7.0_r14android-cts-7.0_r13android-cts-7.0_r12android-cts-7.0_r11android-cts-7.0_r10android-cts-7.0_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1android-7.0.0_r9android-7.0.0_r8android-7.0.0_r7android-7.0.0_r6android-7.0.0_r5android-7.0.0_r4android-7.0.0_r36android-7.0.0_r35android-7.0.0_r34android-7.0.0_r33android-7.0.0_r32android-7.0.0_r31android-7.0.0_r30android-7.0.0_r3android-7.0.0_r29android-7.0.0_r28android-7.0.0_r27android-7.0.0_r24android-7.0.0_r21android-7.0.0_r19android-7.0.0_r17android-7.0.0_r15android-7.0.0_r14android-7.0.0_r13android-7.0.0_r12android-7.0.0_r11android-7.0.0_r10android-7.0.0_r1nougat-releasenougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-mr0.5-releasenougat-dr1-releasenougat-devnougat-cts-releasenougat-bugfix-release
am: 9a337512d9
* commit '9a337512d97e37afc142dee4fd50a41b741a87d2': (797 commits)
Add tests for verifying transport feedback for audio and video.
Eliminate defines in talk/
Revert of Update with new default boringssl no-aes cipher suites. Re-enable tests. (patchset #3 id:40001 of https://codereview.webrtc.org/1550773002/ )
Remove assert which was incorrectly added to TcpPort::OnSentPacket.
Reland Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
Update with new default boringssl no-aes cipher suites. Re-enable tests.
Revert of Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket. (patchset #3 id:40001 of https://codereview.webrtc.org/1577873003/ )
Re-land: "Use an explicit identifier in Config"
Connect TurnPort and TCPPort to AsyncPacketSocket::SignalSentPacket.
Revert of Delete remnants of non-square pixel support from cricket::VideoFrame. (patchset #1 id:1 of https://codereview.webrtc.org/1586613002/ )
Remove libfuzzer trybot from default trybot set.
Add ramp-up tests for transport sequence number with and w/o audio.
Delete remnants of non-square pixel support from cricket::VideoFrame.
Fix IPAddress::ToSensitiveString() to avoid dependency on inet_ntop().
Revert of Storing raw audio sink for default audio track. (patchset #7 id:120001 of https://codereview.chromium.org/1551813002/ )
Re-enable tests that failed under Linux_Msan.
Revert of Use an explicit identifier in Config (patchset #4 id:60001 of https://codereview.webrtc.org/1538643004/ )
Roll chromium_revision 346fea9..099be58 (369082:369139)
Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan
Add build_protobuf variable.
...
Diffstat (limited to 'webrtc/modules/bitrate_controller/bitrate_allocator.cc')
-rw-r--r-- | webrtc/modules/bitrate_controller/bitrate_allocator.cc | 190 |
1 files changed, 0 insertions, 190 deletions
diff --git a/webrtc/modules/bitrate_controller/bitrate_allocator.cc b/webrtc/modules/bitrate_controller/bitrate_allocator.cc deleted file mode 100644 index 0aec528cde..0000000000 --- a/webrtc/modules/bitrate_controller/bitrate_allocator.cc +++ /dev/null @@ -1,190 +0,0 @@ -/* - * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. - * - * Use of this source code is governed by a BSD-style license - * that can be found in the LICENSE file in the root of the source - * tree. An additional intellectual property rights grant can be found - * in the file PATENTS. All contributing project authors may - * be found in the AUTHORS file in the root of the source tree. - * - */ - -#include "webrtc/modules/bitrate_controller/include/bitrate_allocator.h" - -#include <algorithm> -#include <utility> - -#include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" - -namespace webrtc { - -// Allow packets to be transmitted in up to 2 times max video bitrate if the -// bandwidth estimate allows it. -const int kTransmissionMaxBitrateMultiplier = 2; -const int kDefaultBitrateBps = 300000; - -BitrateAllocator::BitrateAllocator() - : crit_sect_(CriticalSectionWrapper::CreateCriticalSection()), - bitrate_observers_(), - enforce_min_bitrate_(true), - last_bitrate_bps_(kDefaultBitrateBps), - last_fraction_loss_(0), - last_rtt_(0) { -} - - -void BitrateAllocator::OnNetworkChanged(uint32_t bitrate, - uint8_t fraction_loss, - int64_t rtt) { - CriticalSectionScoped lock(crit_sect_.get()); - last_bitrate_bps_ = bitrate; - last_fraction_loss_ = fraction_loss; - last_rtt_ = rtt; - ObserverBitrateMap allocation = AllocateBitrates(); - for (const auto& kv : allocation) - kv.first->OnNetworkChanged(kv.second, last_fraction_loss_, last_rtt_); -} - -BitrateAllocator::ObserverBitrateMap BitrateAllocator::AllocateBitrates() { - if (bitrate_observers_.empty()) - return ObserverBitrateMap(); - - uint32_t sum_min_bitrates = 0; - for (const auto& observer : bitrate_observers_) - sum_min_bitrates += observer.second.min_bitrate; - if (last_bitrate_bps_ <= sum_min_bitrates) - return LowRateAllocation(last_bitrate_bps_); - else - return NormalRateAllocation(last_bitrate_bps_, sum_min_bitrates); -} - -int BitrateAllocator::AddBitrateObserver(BitrateObserver* observer, - uint32_t min_bitrate_bps, - uint32_t max_bitrate_bps) { - CriticalSectionScoped lock(crit_sect_.get()); - - BitrateObserverConfList::iterator it = - FindObserverConfigurationPair(observer); - - // Allow the max bitrate to be exceeded for FEC and retransmissions. - // TODO(holmer): We have to get rid of this hack as it makes it difficult to - // properly allocate bitrate. The allocator should instead distribute any - // extra bitrate after all streams have maxed out. - max_bitrate_bps *= kTransmissionMaxBitrateMultiplier; - if (it != bitrate_observers_.end()) { - // Update current configuration. - it->second.min_bitrate = min_bitrate_bps; - it->second.max_bitrate = max_bitrate_bps; - } else { - // Add new settings. - bitrate_observers_.push_back(BitrateObserverConfiguration( - observer, BitrateConfiguration(min_bitrate_bps, max_bitrate_bps))); - bitrate_observers_modified_ = true; - } - - ObserverBitrateMap allocation = AllocateBitrates(); - int new_observer_bitrate_bps = 0; - for (auto& kv : allocation) { - kv.first->OnNetworkChanged(kv.second, last_fraction_loss_, last_rtt_); - if (kv.first == observer) - new_observer_bitrate_bps = kv.second; - } - return new_observer_bitrate_bps; -} - -void BitrateAllocator::RemoveBitrateObserver(BitrateObserver* observer) { - CriticalSectionScoped lock(crit_sect_.get()); - BitrateObserverConfList::iterator it = - FindObserverConfigurationPair(observer); - if (it != bitrate_observers_.end()) { - bitrate_observers_.erase(it); - bitrate_observers_modified_ = true; - } -} - -void BitrateAllocator::GetMinMaxBitrateSumBps(int* min_bitrate_sum_bps, - int* max_bitrate_sum_bps) const { - *min_bitrate_sum_bps = 0; - *max_bitrate_sum_bps = 0; - - CriticalSectionScoped lock(crit_sect_.get()); - for (const auto& observer : bitrate_observers_) { - *min_bitrate_sum_bps += observer.second.min_bitrate; - *max_bitrate_sum_bps += observer.second.max_bitrate; - } -} - -BitrateAllocator::BitrateObserverConfList::iterator -BitrateAllocator::FindObserverConfigurationPair( - const BitrateObserver* observer) { - for (auto it = bitrate_observers_.begin(); it != bitrate_observers_.end(); - ++it) { - if (it->first == observer) - return it; - } - return bitrate_observers_.end(); -} - -void BitrateAllocator::EnforceMinBitrate(bool enforce_min_bitrate) { - CriticalSectionScoped lock(crit_sect_.get()); - enforce_min_bitrate_ = enforce_min_bitrate; -} - -BitrateAllocator::ObserverBitrateMap BitrateAllocator::NormalRateAllocation( - uint32_t bitrate, - uint32_t sum_min_bitrates) { - uint32_t number_of_observers = bitrate_observers_.size(); - uint32_t bitrate_per_observer = - (bitrate - sum_min_bitrates) / number_of_observers; - // Use map to sort list based on max bitrate. - ObserverSortingMap list_max_bitrates; - for (const auto& observer : bitrate_observers_) { - list_max_bitrates.insert(std::pair<uint32_t, ObserverConfiguration>( - observer.second.max_bitrate, - ObserverConfiguration(observer.first, observer.second.min_bitrate))); - } - ObserverBitrateMap allocation; - ObserverSortingMap::iterator max_it = list_max_bitrates.begin(); - while (max_it != list_max_bitrates.end()) { - number_of_observers--; - uint32_t observer_allowance = - max_it->second.min_bitrate + bitrate_per_observer; - if (max_it->first < observer_allowance) { - // We have more than enough for this observer. - // Carry the remainder forward. - uint32_t remainder = observer_allowance - max_it->first; - if (number_of_observers != 0) { - bitrate_per_observer += remainder / number_of_observers; - } - allocation[max_it->second.observer] = max_it->first; - } else { - allocation[max_it->second.observer] = observer_allowance; - } - list_max_bitrates.erase(max_it); - // Prepare next iteration. - max_it = list_max_bitrates.begin(); - } - return allocation; -} - -BitrateAllocator::ObserverBitrateMap BitrateAllocator::LowRateAllocation( - uint32_t bitrate) { - ObserverBitrateMap allocation; - if (enforce_min_bitrate_) { - // Min bitrate to all observers. - for (const auto& observer : bitrate_observers_) - allocation[observer.first] = observer.second.min_bitrate; - } else { - // Allocate up to |min_bitrate| to one observer at a time, until - // |bitrate| is depleted. - uint32_t remainder = bitrate; - for (const auto& observer : bitrate_observers_) { - uint32_t allocated_bitrate = - std::min(remainder, observer.second.min_bitrate); - allocation[observer.first] = allocated_bitrate; - remainder -= allocated_bitrate; - } - } - return allocation; -} -} // namespace webrtc |