Generalize FEC header formatting. (pt. 4)

webrtc/modules/rtp_rtcp/source/producer_fec.h

 /*
  *  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 23 matching lines @@
   size_t length() const;
 
  private:
   std::unique_ptr<uint8_t[]> data_;
   size_t length_;
   size_t header_length_;
 };
 
 class ProducerFec {
  public:
-  explicit ProducerFec(ForwardErrorCorrection* fec);
+  ProducerFec();

[danilchap, 2016/08/22 13:00:41]

Isn't this reducing genearlization or ProducerFec can work with ulpfec only?

[brandtr, 2016/08/23 08:19:11]

Correct, ProducerFec will only support Ulpfec. (In fact, that class will later
be renamed UlpfecSender). The reason for not generalizing the
{Ulp,Flex}fecSender and {Ulp,Flex}fecReceiver is that they do different things.
The Ulpfec classes will for example deal with RED packaging, which the Flexfec
classes will not.

   ~ProducerFec();
 
   static std::unique_ptr<RedPacket> BuildRedPacket(const uint8_t* data_buffer,
                                                    size_t payload_length,
                                                    size_t rtp_header_length,
                                                    int red_payload_type);
 
   void SetFecParameters(const FecProtectionParams* params,
                         int num_first_partition);
 
@@ skipping 15 matching lines @@
   // |min_num_media_packets_|. This condition tries to capture the effect
   // that, for the same amount of protection/overhead, longer codes
   // (e.g. (2k,2m) vs (k,m)) are generally more effective at recovering losses.
   bool MinimumMediaPacketsReached() const;
 
   // Returns true if there are generated FEC packets available.
   bool FecAvailable() const;
 
   size_t NumAvailableFecPackets() const;
 
+  size_t MaxPacketOverhead() const;
+
   // Returns generated FEC packets with RED headers added.
   std::vector<std::unique_ptr<RedPacket>> GetFecPacketsAsRed(
       int red_payload_type,
       int ulpfec_payload_type,
       uint16_t first_seq_num,
       size_t rtp_header_length);
 
  private:
   void DeleteMediaPackets();
   int Overhead() const;
-  ForwardErrorCorrection* fec_;
+  ForwardErrorCorrection fec_;
   ForwardErrorCorrection::PacketList media_packets_;
   std::list<ForwardErrorCorrection::Packet*> generated_fec_packets_;
   int num_protected_frames_;
   int num_important_packets_;
   int min_num_media_packets_;
   FecProtectionParams params_;
   FecProtectionParams new_params_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_PRODUCER_FEC_H_