Generalize FEC header formatting. (pt. 4)

webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc

Index: webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
diff --git a/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
index b7c4ef5506b1a11f67e573cfae7d8cacd3edec9a..695caa4c3634586704dbcb5ceaef3009bbaa792b 100644
--- a/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
+++ b/webrtc/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
@@ -730,12 +730,14 @@ class FecPacketMaskMetricsTest : public ::testing::Test {
     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];
     // 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;
+      const int mask_bytes_fec_packet = (num_media_packets > 16)

[danilchap, 2016/08/25 17:49:15]

may be use internal::PacketMaskSize(num_media_packets) here instead.

[brandtr, 2016/08/26 11:22:23]

Done.

+                                            ? kUlpfecPacketMaskSizeLBitSet
+                                            : kUlpfecPacketMaskSizeLBitClear;
       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++) {