Fix for video protection_bitrate in BWE with overhead.

webrtc/video/video_send_stream.cc

 /*
  *  Copyright (c) 2013 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.
  */
 #include "webrtc/video/video_send_stream.h"
@@ skipping 258 matching lines @@
   } else if (pad_to_min_bitrate) {
     pad_up_to_bitrate_bps = streams[0].min_bitrate_bps;
   }
 
   pad_up_to_bitrate_bps =
       std::max(pad_up_to_bitrate_bps, min_transmit_bitrate_bps);
 
   return pad_up_to_bitrate_bps;
 }
 
+uint32_t CalculateOverheadRateBps(uint32_t bitrate_bps,
+                                  size_t packet_size_byte,

[stefan-webrtc, 2016/12/12 16:19:55]

packet_size_bytes

[michaelt, 2016/12/13 13:07:16]

Done.

+                                  size_t overhead_byte_per_packet) {

[stefan-webrtc, 2016/12/12 16:19:55]

overhead_bytes_per_packet or packet_overhead_bytes?

[michaelt, 2016/12/13 13:07:16]

Done.

+  if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe-WithOverhead") !=
+      "Enabled")
+    return 0;
+  int packets_per_second = std::ceil(bitrate_bps / (8 * packet_size_byte));
+  return static_cast<uint32_t>(8 * overhead_byte_per_packet *
+                               packets_per_second);
+}
+
 }  // namespace
 
 namespace internal {
 
 // VideoSendStreamImpl implements internal::VideoSendStream.
 // It is created and destroyed on |worker_queue|. The intent is to decrease the
 // need for locking and to ensure methods are called in sequence.
 // Public methods except |DeliverRtcp| must be called on |worker_queue|.
 // DeliverRtcp is called on the libjingle worker thread or a network thread.
 // An encoder may deliver frames through the EncodedImageCallback on an
@@ skipping 890 matching lines @@
 }
 
 uint32_t VideoSendStreamImpl::OnBitrateUpdated(uint32_t bitrate_bps,
                                                uint8_t fraction_loss,
                                                int64_t rtt,
                                                int64_t probing_interval_ms) {
   RTC_DCHECK_RUN_ON(worker_queue_);
   RTC_DCHECK(payload_router_.IsActive())
       << "VideoSendStream::Start has not been called.";
 
-  if (webrtc::field_trial::FindFullName("WebRTC-SendSideBwe-WithOverhead") ==
-      "Enabled") {
-    // Substract overhead from bitrate.
-    rtc::CritScope lock(&overhead_bytes_per_packet_crit_);
-    int packets_per_second =
-        std::ceil(bitrate_bps / (8 * (config_->rtp.max_packet_size +
-                                      transport_overhead_bytes_per_packet_)));
-    uint32_t overhead_bps = static_cast<uint32_t>(
-        8 * overhead_bytes_per_packet_ * packets_per_second);
-    bitrate_bps = overhead_bps > bitrate_bps ? 0u : bitrate_bps - overhead_bps;
-  }
+  // Substract overhead from bitrate.
+  rtc::CritScope lock(&overhead_bytes_per_packet_crit_);
+  uint32_t overhead_bps = CalculateOverheadRateBps(
+      bitrate_bps,
+      config_->rtp.max_packet_size + transport_overhead_bytes_per_packet_,
+      overhead_bytes_per_packet_);
+  bitrate_bps = overhead_bps > bitrate_bps ? 0u : bitrate_bps - overhead_bps;
 
   // Get the encoder target rate. It is the estimated network rate -
   // protection overhead.
   encoder_target_rate_bps_ = protection_bitrate_calculator_.SetTargetRates(
       bitrate_bps, stats_proxy_->GetSendFrameRate(), fraction_loss, rtt);
   uint32_t protection_bitrate = bitrate_bps - encoder_target_rate_bps_;
 
   encoder_target_rate_bps_ =
       std::min(encoder_max_bitrate_bps_, encoder_target_rate_bps_);
   vie_encoder_->OnBitrateUpdated(encoder_target_rate_bps_, fraction_loss, rtt);
   stats_proxy_->OnSetEncoderTargetRate(encoder_target_rate_bps_);
-  return protection_bitrate;
+  // Add overhead to the protection_bitrate
+  return protection_bitrate +
+         CalculateOverheadRateBps(protection_bitrate,
+                                  config_->rtp.max_packet_size +
+                                      transport_overhead_bytes_per_packet_ -
+                                      overhead_bytes_per_packet_,
+                                  overhead_bytes_per_packet_);

[stefan-webrtc, 2016/12/12 16:19:55]

The overhead for FEC isn't the same as the overhead for media packets. Maybe
it's not worth taking that into account here though...

[michaelt, 2016/12/13 08:07:09]

Do you think it's not worth to take the overhead into account or the differences
in overhead between FEC and media packets?

[stefan-webrtc, 2016/12/13 08:16:30]

The difference in overhead. Do you agree?

[michaelt, 2016/12/13 13:07:16]

I don't know how the video FEC packets are build. If you think the difference is
not big between FEC and media overhead, I'm OK with it.
 

[stefan-webrtc, 2016/12/13 13:26:04]

Instead of doing this, maybe we should do:

protection_bitrate = bitrate_bps -
CalculateOverheadRateBps(encoder_target_rate_bps_, ...);

and remove line 1206?

[michaelt, 2016/12/20 10:15:56]

Did something similar to your idea pleas take a look.

 }
 
 void VideoSendStreamImpl::EnableEncodedFrameRecording(
     const std::vector<rtc::PlatformFile>& files,
     size_t byte_limit) {
   {
     rtc::CritScope lock(&ivf_writers_crit_);
     for (unsigned int i = 0; i < kMaxSimulcastStreams; ++i) {
       if (i < files.size()) {
         file_writers_[i] = IvfFileWriter::Wrap(rtc::File(files[i]), byte_limit);
@@ skipping 48 matching lines @@
   const uint16_t mtu = static_cast<uint16_t>(
       config_->rtp.max_packet_size + transport_overhead_bytes_per_packet);
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     rtp_rtcp->SetTransportOverhead(transport_overhead_bytes_per_packet);
     rtp_rtcp->SetMaxTransferUnit(mtu);
   }
 }
 
 }  // namespace internal
 }  // namespace webrtc