Set pacer target bitrate to max of bwe and bitrate allocation.

webrtc/video_engine/vie_channel_group.cc

Index: webrtc/video_engine/vie_channel_group.cc
diff --git a/webrtc/video_engine/vie_channel_group.cc b/webrtc/video_engine/vie_channel_group.cc
index 51ef83cbcb86f2c5588aa205fe3a4c63ad9525b7..4fc0c20d24c50f029262a33f65b5f8075aae9501 100644
--- a/webrtc/video_engine/vie_channel_group.cc
+++ b/webrtc/video_engine/vie_channel_group.cc
@@ -380,7 +380,9 @@ void ChannelGroup::SignalNetworkState(NetworkState state) {
 void ChannelGroup::OnNetworkChanged(uint32_t target_bitrate_bps,
                                     uint8_t fraction_loss,
                                     int64_t rtt) {
-  bitrate_allocator_->OnNetworkChanged(target_bitrate_bps, fraction_loss, rtt);
+  uint32_t allocated_bitrate = bitrate_allocator_->OnNetworkChanged(

[stefan-webrtc, 2015/10/20 10:13:47]

unit on allocated_bitrate

[sprang_webrtc, 2015/10/21 08:09:16]

Done.

+      target_bitrate_bps, fraction_loss, rtt);
+  target_bitrate_bps = std::max(target_bitrate_bps, allocated_bitrate);

[mflodman, 2015/10/20 10:10:45]

And also comment why this is done.

[mflodman, 2015/10/20 10:10:45]

I'd prefer a new variable with another name for this one.

[sprang_webrtc, 2015/10/21 08:09:16]

Done.

[sprang_webrtc, 2015/10/21 08:09:16]

Done.

   int pad_up_to_bitrate_bps = 0;
   {
     rtc::CritScope lock(&encoder_crit_);