Chromium Code Reviews| Index: webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc |
| diff --git a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc |
| index 7264541bb97a2b8e55ec6067818fabcb9bfbf2c5..42449f24edf30dfed36beca524c6f767c937456c 100644 |
| --- a/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc |
| +++ b/webrtc/modules/video_coding/utility/simulcast_rate_allocator.cc |
| @@ -29,7 +29,7 @@ std::vector<uint32_t> webrtc::SimulcastRateAllocator::GetAllocation( |
| if (codec_.maxBitrate) |
| left_to_allocate = std::min(left_to_allocate, codec_.maxBitrate); |
| - if (codec_.numberOfSimulcastStreams == 0) { |
| + if (codec_.numberOfSimulcastStreams < 2) { |
| // No simulcast, just set the target as this has been capped already. |
| return std::vector<uint32_t>(1, left_to_allocate); |
| } |
| @@ -65,6 +65,15 @@ std::vector<uint32_t> webrtc::SimulcastRateAllocator::GetAllocation( |
| return allocated_bitrates_bps; |
| } |
| +uint32_t SimulcastRateAllocator::GetPreferedBitrate() const { |
| + std::vector<uint32_t> rates = GetAllocation(codec_.maxBitrate); |
| + uint32_t preferred_bitrate = 0; |
| + for (auto& rate : rates) { |
|
sprang_webrtc
2016/09/27 10:55:07
Prefer not using auto unless type is very verbose.
perkj_webrtc
2016/09/27 11:33:12
Done.
|
| + preferred_bitrate += rate; |
| + } |
| + return preferred_bitrate; |
| +} |
| + |
| const VideoCodec& webrtc::SimulcastRateAllocator::GetCodec() const { |
| return codec_; |
| } |