Generalize FEC header formatting. (pt. 4)

webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.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 712 matching lines @@
       fprintf(fp_mask_, "\n");
     }
     fprintf(fp_mask_, "\n");
   }
 
   int ProcessXORPacketMasks(CodeType code_type,
                           FecMaskType fec_mask_type) {
     int code_index = 0;
     // Maximum number of media packets allowed for the mask type.
     const int packet_mask_max = kMaxMediaPackets[fec_mask_type];
-    uint8_t* packet_mask = new uint8_t[packet_mask_max * kMaskSizeLBitSet];
+    uint8_t* packet_mask =
+        new uint8_t[packet_mask_max * kUlpfecPacketMaskSizeLBitSet];

[danilchap, 2016/08/29 12:26:03]

kUlpfecMaxPacketMaskSize probably make more sense when used as buffer size

[brandtr, 2016/08/30 07:12:42]

Done.

     // Loop through codes up to |kMaxMediaPacketsTest|.
     for (int num_media_packets = 1; num_media_packets <= kMaxMediaPacketsTest;
         num_media_packets++) {
       const int mask_bytes_fec_packet =
-          (num_media_packets > 16) ? kMaskSizeLBitSet : kMaskSizeLBitClear;
+          internal::PacketMaskSize(num_media_packets);
       internal::PacketMaskTable mask_table(fec_mask_type, num_media_packets);
       for (int num_fec_packets = 1; num_fec_packets <= num_media_packets;
           num_fec_packets++) {
         memset(packet_mask, 0, num_media_packets * mask_bytes_fec_packet);
         memcpy(packet_mask, mask_table.fec_packet_mask_table()
                [num_media_packets - 1][num_fec_packets - 1],
                num_fec_packets * mask_bytes_fec_packet);
         // Convert to bit mask.
         GetPacketMaskConvertToBitMask(packet_mask,
                                       num_media_packets,
@@ skipping 324 matching lines @@
                 recovery_rate_per_loss[loss_number],
                 kRecoveryRateXorRandom[2]);
       EXPECT_GE(kMetricsXorBursty[code_index].
                 recovery_rate_per_loss[loss_number],
                 kRecoveryRateXorBursty[2]);
     }
   }
 }
 
 }  // namespace webrtc