Generalize FEC unit tests and rename GenerateFec. (pt. 3)

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.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
 
 #include <memory>
 #include <utility>
 
 #include "webrtc/base/basictypes.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
 namespace webrtc {
 
 constexpr size_t kRedForFecHeaderLength = 1;
 
 // This controls the maximum amount of excess overhead (actual - target)
-// allowed in order to trigger GenerateFec(), before |params_.max_fec_frames|
+// allowed in order to trigger EncodeFec(), before |params_.max_fec_frames|
 // is reached. Overhead here is defined as relative to number of media packets.
 constexpr int kMaxExcessOverhead = 50;  // Q8.
 
 // This is the minimum number of media packets required (above some protection
-// level) in order to trigger GenerateFec(), before |params_.max_fec_frames| is
+// level) in order to trigger EncodeFec(), before |params_.max_fec_frames| is
 // reached.
 constexpr size_t kMinMediaPackets = 4;
 
 // Threshold on the received FEC protection level, above which we enforce at
 // least |kMinMediaPackets| packets for the FEC code. Below this
 // threshold |kMinMediaPackets| is set to default value of 1.
 //
 // The range is between 0 and 255, where 255 corresponds to 100% overhead
 // (relative to the number of protected media packets).
 constexpr uint8_t kHighProtectionThreshold = 80;
@@ skipping 125 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_.EncodeFec(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 69 matching lines @@
       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