Minor fixes in FEC and RtpSender{,Video}. (pt. 2)

webrtc/modules/rtp_rtcp/source/producer_fec.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 74 matching lines @@
 }
 
 uint8_t* RedPacket::data() const {
   return data_.get();
 }
 
 size_t RedPacket::length() const {
   return length_;
 }
 
-ProducerFec::ProducerFec(ForwardErrorCorrection* fec)
-    : fec_(fec),
-      media_packets_(),
-      generated_fec_packets_(),
-      num_protected_frames_(0),
+ProducerFec::ProducerFec()
+    : num_protected_frames_(0),
       num_important_packets_(0),
-      min_num_media_packets_(1),
-      params_(),
-      new_params_() {
+      min_num_media_packets_(1)  {
   memset(&params_, 0, sizeof(params_));
   memset(&new_params_, 0, sizeof(new_params_));
 }
 
 ProducerFec::~ProducerFec() {
   DeleteMediaPackets();
 }
 
 std::unique_ptr<RedPacket> ProducerFec::BuildRedPacket(
     const uint8_t* data_buffer,
@@ skipping 59 matching lines @@
       (num_protected_frames_ == params_.max_fec_frames ||
        (ExcessOverheadBelowMax() && MinimumMediaPacketsReached()))) {
     RTC_DCHECK_LE(num_important_packets_,
                   static_cast<int>(ForwardErrorCorrection::kMaxMediaPackets));
     // TODO(pbos): Consider whether unequal protection should be enabled or not,
     // it is currently always disabled.
     //
     // Since unequal protection is disabled, the value of
     // |num_important_packets_| has no importance when calling GenerateFec().
     constexpr bool kUseUnequalProtection = false;
-    int ret = fec_->GenerateFec(media_packets_, params_.fec_rate,
-                                num_important_packets_, kUseUnequalProtection,
-                                params_.fec_mask_type, &generated_fec_packets_);
+    int ret = fec_.GenerateFec(media_packets_, params_.fec_rate,
+                               num_important_packets_, kUseUnequalProtection,
+                               params_.fec_mask_type, &generated_fec_packets_);
     if (generated_fec_packets_.empty()) {
       num_protected_frames_ = 0;
       DeleteMediaPackets();
     }
     return ret;
   }
   return 0;
 }
 
 bool ProducerFec::ExcessOverheadBelowMax() const {
@@ skipping 14 matching lines @@
 }
 
 bool ProducerFec::FecAvailable() const {
   return !generated_fec_packets_.empty();
 }
 
 size_t ProducerFec::NumAvailableFecPackets() const {
   return generated_fec_packets_.size();
 }
 
+size_t ProducerFec::MaxPacketOverhead() const {
+  return fec_.MaxPacketOverhead();
+}
+
 std::vector<std::unique_ptr<RedPacket>> ProducerFec::GetFecPacketsAsRed(
     int red_payload_type,
     int ulpfec_payload_type,
     uint16_t first_seq_num,
     size_t rtp_header_length) {
   std::vector<std::unique_ptr<RedPacket>> red_packets;
   red_packets.reserve(generated_fec_packets_.size());
   RTC_DCHECK(!media_packets_.empty());
   ForwardErrorCorrection::Packet* last_media_packet =
       media_packets_.back().get();
@@ skipping 21 matching lines @@
   return red_packets;
 }
 
 int ProducerFec::Overhead() const {
   // Overhead is defined as relative to the number of media packets, and not
   // relative to total number of packets. This definition is inherited from the
   // protection factor produced by video_coding module and how the FEC
   // generation is implemented.
   RTC_DCHECK(!media_packets_.empty());
   int num_fec_packets =
-      fec_->GetNumberOfFecPackets(media_packets_.size(), params_.fec_rate);
+      fec_.NumFecPackets(media_packets_.size(), params_.fec_rate);
   // Return the overhead in Q8.
   return (num_fec_packets << 8) / media_packets_.size();
 }
 
 void ProducerFec::DeleteMediaPackets() {
   media_packets_.clear();
 }
 
 }  // namespace webrtc