Move InsertZeroColumns and CopyColumn to ::internal. (pt. 1)

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 211 matching lines @@
   // Analyzes |media_packets| for holes in the sequence and inserts zero columns
   // into the |packet_mask| where those holes are found. Zero columns means that
   // those packets will have no protection.
   // Returns the number of bits used for one row of the new packet mask.
   // Requires that |packet_mask| has at least 6 * |num_fec_packets| bytes
   // allocated.
   int InsertZerosInBitMasks(const PacketList& media_packets,
                             uint8_t* packet_mask, int num_mask_bytes,
                             int num_fec_packets);
 
-  // Inserts |num_zeros| zero columns into |new_mask| at position
-  // |new_bit_index|. If the current byte of |new_mask| can't fit all zeros, the
-  // byte will be filled with zeros from |new_bit_index|, but the next byte will
-  // be untouched.
-  static void InsertZeroColumns(int num_zeros, uint8_t* new_mask,
-                                int new_mask_bytes, int num_fec_packets,
-                                int new_bit_index);
-
-  // Copies the left most bit column from the byte pointed to by
-  // |old_bit_index| in |old_mask| to the right most column of the byte pointed
-  // to by |new_bit_index| in |new_mask|. |old_mask_bytes| and |new_mask_bytes|
-  // represent the number of bytes used per row for each mask. |num_fec_packets|
-  // represent the number of rows of the masks.
-  // The copied bit is shifted out from |old_mask| and is shifted one step to
-  // the left in |new_mask|. |new_mask| will contain "xxxx xxn0" after this
-  // operation, where x are previously inserted bits and n is the new bit.
-  static void CopyColumn(uint8_t* new_mask, int new_mask_bytes,
-                         uint8_t* old_mask, int old_mask_bytes,
-                         int num_fec_packets, int new_bit_index,
-                         int old_bit_index);
 
   void GenerateFecUlpHeaders(const PacketList& media_packets,
                              uint8_t* packet_mask, int num_fec_packets,
                              bool l_bit);
 
   void GenerateFecBitStrings(const PacketList& media_packets,
                              uint8_t* packet_mask, int num_fec_packets,
                              bool l_bit);
 
   // Inserts the |received_packets| into the internal received FEC packet list
@@ skipping 59 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_