| Index: webrtc/call/bitrate_allocator.h
|
| diff --git a/webrtc/call/bitrate_allocator.h b/webrtc/call/bitrate_allocator.h
|
| index 404a312dad3745d70c3b4c71af7150dc9f02eee7..5264bb641bbf168a38649c0547efca1d2c9174d5 100644
|
| --- a/webrtc/call/bitrate_allocator.h
|
| +++ b/webrtc/call/bitrate_allocator.h
|
| @@ -42,11 +42,9 @@ class BitrateAllocator {
|
| BitrateAllocator();
|
|
|
| // Allocate target_bitrate across the registered BitrateAllocatorObservers.
|
| - // Returns actual bitrate allocated (might be higher than target_bitrate if
|
| - // for instance EnforceMinBitrate() is enabled.
|
| - uint32_t OnNetworkChanged(uint32_t target_bitrate,
|
| - uint8_t fraction_loss,
|
| - int64_t rtt);
|
| + void OnNetworkChanged(uint32_t target_bitrate,
|
| + uint8_t fraction_loss,
|
| + int64_t rtt);
|
|
|
| // Set the start and max send bitrate used by the bandwidth management.
|
| //
|
| @@ -60,9 +58,6 @@ class BitrateAllocator {
|
|
|
| void RemoveObserver(BitrateAllocatorObserver* observer);
|
|
|
| - void GetMinMaxBitrateSumBps(int* min_bitrate_sum_bps,
|
| - int* max_bitrate_sum_bps) const;
|
| -
|
| // This method controls the behavior when the available bitrate is lower than
|
| // the minimum bitrate, or the sum of minimum bitrates.
|
| // When true, the bitrate will never be set lower than the minimum bitrate(s).
|
| @@ -70,6 +65,10 @@ class BitrateAllocator {
|
| // respective minimum bitrate, satisfying one observer after the other.
|
| void EnforceMinBitrate(bool enforce_min_bitrate);
|
|
|
| + // Returns the minimum send bitrate. Zero if EnforceMinBitrate(false)
|
| + // has been called.
|
| + int GetMinSendBitrate() const;
|
| +
|
| private:
|
| struct BitrateConfiguration {
|
| BitrateConfiguration(uint32_t min_bitrate, uint32_t max_bitrate)
|
| @@ -97,6 +96,7 @@ class BitrateAllocator {
|
| uint32_t sum_min_bitrates)
|
| EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
| + ObserverBitrateMap ZeroRateAllocation() EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
| ObserverBitrateMap LowRateAllocation(uint32_t bitrate)
|
| EXCLUSIVE_LOCKS_REQUIRED(crit_sect_);
|
|
|
|
|