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

webrtc/modules/rtp_rtcp/source/forward_error_correction.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 168 matching lines @@
   //                            list will be valid until the next call to
   //                            DecodeFec().
   //
   // Returns 0 on success, -1 on failure.
   //
   int DecodeFec(ReceivedPacketList* received_packets,
                 RecoveredPacketList* recovered_packets);
 
   // Get the number of generated FEC packets, given the number of media packets
   // and the protection factor.
-  int GetNumberOfFecPackets(int num_media_packets, int protection_factor);
+  static int NumFecPackets(int num_media_packets, int protection_factor);
 
-  // Gets the size in bytes of the FEC/ULP headers, which must be accounted for
-  // as packet overhead. Returns the packet overhead in bytes.
-  static size_t PacketOverhead();
+  // Gets the maximum size of the FEC headers in bytes, which must be
+  // accounted for as packet overhead.
+  size_t MaxPacketOverhead() const;
 
   // Reset internal states from last frame and clear |recovered_packets|.
   // Frees all memory allocated by this class.
   void ResetState(RecoveredPacketList* recovered_packets);
 
  private:
   // Used to link media packets to their protecting FEC packets.
   //
   // TODO(holmer): Refactor into a proper class.
   class ProtectedPacket : public ForwardErrorCorrection::SortablePacket {
@@ skipping 97 matching lines @@
   ReceivedFecPacketList received_fec_packets_;
 
   // Arrays used to avoid dynamically allocating memory when generating
   // the packet masks in the ULPFEC headers.
   // (There are never more than |kMaxMediaPackets| FEC packets generated.)
   uint8_t packet_mask_[kMaxMediaPackets * kMaskSizeLBitSet];
   uint8_t tmp_packet_mask_[kMaxMediaPackets * kMaskSizeLBitSet];
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_FORWARD_ERROR_CORRECTION_H_