Generalize FEC unit tests and rename GenerateFec. (pt. 3)

webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc b/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc
index b42035c8feb98eed58c58a5cdb81a0368f13b618..3b1b0fa7876c613aab4406e9bcae7b4b68780e46 100644
--- a/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/producer_fec_unittest.cc
@@ -18,6 +18,15 @@
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 #include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
 
+using ::webrtc::test::fec::RawRtpPacket;
+
+namespace {
+
+constexpr uint8_t kFecPayloadType = 96;
+constexpr uint8_t kRedPayloadType = 97;
+
+}  // namespace
+
 namespace webrtc {
 
 void VerifyHeader(uint16_t seq_num,
@@ -42,7 +51,7 @@ void VerifyHeader(uint16_t seq_num,
 class ProducerFecTest : public ::testing::Test {
  protected:
   ProducerFec producer_;
-  FrameGenerator generator_;
+  test::fec::FrameGenerator generator_;
 };
 
 // Verifies bug found via fuzzing, where a gap in the packet sequence caused us
@@ -97,12 +106,12 @@ TEST_F(ProducerFecTest, OneFrameFec) {
   // media packets for 1 frame is at least |minimum_media_packets_fec_|.
   const int kNumPackets = 4;
   FecProtectionParams params = {15, 3, kFecMaskRandom};
-  std::list<test::RawRtpPacket*> rtp_packets;
+  std::list<RawRtpPacket*> rtp_packets;
   generator_.NewFrame(kNumPackets);
   producer_.SetFecParameters(&params, 0);  // Expecting one FEC packet.
   uint32_t last_timestamp = 0;
   for (int i = 0; i < kNumPackets; ++i) {
-    test::RawRtpPacket* rtp_packet = generator_.NextPacket(i, 10);
+    RawRtpPacket* rtp_packet = generator_.NextPacket(i, 10);
     rtp_packets.push_back(rtp_packet);
     EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec(
                      rtp_packet->data, rtp_packet->length, kRtpHeaderSize));
@@ -135,14 +144,13 @@ TEST_F(ProducerFecTest, TwoFrameFec) {
   const int kNumFrames = 2;
 
   FecProtectionParams params = {15, 3, kFecMaskRandom};
-  std::list<test::RawRtpPacket*> rtp_packets;
+  std::list<RawRtpPacket*> rtp_packets;
   producer_.SetFecParameters(&params, 0);  // Expecting one FEC packet.
   uint32_t last_timestamp = 0;
   for (int i = 0; i < kNumFrames; ++i) {
     generator_.NewFrame(kNumPackets);
     for (int j = 0; j < kNumPackets; ++j) {
-      test::RawRtpPacket* rtp_packet =
-          generator_.NextPacket(i * kNumPackets + j, 10);
+      RawRtpPacket* rtp_packet = generator_.NextPacket(i * kNumPackets + j, 10);
       rtp_packets.push_back(rtp_packet);
       EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec(
                        rtp_packet->data, rtp_packet->length, kRtpHeaderSize));
@@ -166,16 +174,14 @@ TEST_F(ProducerFecTest, TwoFrameFec) {
 
 TEST_F(ProducerFecTest, BuildRedPacket) {
   generator_.NewFrame(1);
-  test::RawRtpPacket* packet = generator_.NextPacket(0, 10);
+  RawRtpPacket* packet = generator_.NextPacket(0, 10);
   std::unique_ptr<RedPacket> red_packet =
       ProducerFec::BuildRedPacket(packet->data, packet->length - kRtpHeaderSize,
                                   kRtpHeaderSize, kRedPayloadType);
   EXPECT_EQ(packet->length + 1, red_packet->length());
   VerifyHeader(packet->header.header.sequenceNumber,
-               packet->header.header.timestamp,
-               kRedPayloadType,
-               packet->header.header.payloadType,
-               red_packet.get(),
+               packet->header.header.timestamp, kRedPayloadType,
+               packet->header.header.payloadType, red_packet.get(),
                true);  // Marker bit set.
   for (int i = 0; i < 10; ++i)
     EXPECT_EQ(i, red_packet->data()[kRtpHeaderSize + 1 + i]);