Base padding bitrate for an encoder on the bitrate allocated for that encoder, rather than the tota…

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 456 matching lines @@
   }
 }
 
 void ChannelGroup::OnNetworkChanged(uint32_t target_bitrate_bps,
                                     uint8_t fraction_loss,
                                     int64_t rtt) {
   bitrate_allocator_->OnNetworkChanged(target_bitrate_bps, fraction_loss, rtt);
   int pad_up_to_bitrate_bps = 0;
   {
     CriticalSectionScoped lock(encoder_map_cs_.get());
     for (const auto& encoder : send_encoders_) {

[pbos-webrtc, 2015/07/15 10:53:35]

remove {}s

[stefan-webrtc, 2015/07/15 10:54:52]

Done.

-      pad_up_to_bitrate_bps +=
-          encoder.second->GetPaddingNeededBps(target_bitrate_bps);
+      pad_up_to_bitrate_bps += encoder.second->GetPaddingNeededBps();
     }
   }
   pacer_->UpdateBitrate(
       target_bitrate_bps / 1000,
       PacedSender::kDefaultPaceMultiplier * target_bitrate_bps / 1000,
       pad_up_to_bitrate_bps / 1000);
 }
 }  // namespace webrtc