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

webrtc/video_engine/vie_channel_group.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 362 matching lines @@
     pacer_->Resume();
   } else {
     pacer_->Pause();
   }
 }
 
 // TODO(mflodman): Move this logic out from ChannelGroup.
 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_);
     for (const auto& encoder : encoders_)
       pad_up_to_bitrate_bps += encoder->GetPaddingNeededBps();
   }
   pacer_->UpdateBitrate(
       target_bitrate_bps / 1000,
       PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
       pad_up_to_bitrate_bps / 1000);
 }
 
 void ChannelGroup::OnSentPacket(const rtc::SentPacket& sent_packet) {
   if (transport_feedback_adapter_) {
     transport_feedback_adapter_->UpdateSendTime(sent_packet.packet_id,
                                                 sent_packet.send_time_ms);
   }
 }
 }  // namespace webrtc