Generalize UlpfecPacketGenerator into AugmentedPacketGenerator. (pt. 8)

webrtc/modules/rtp_rtcp/source/producer_fec_unittest.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.
  */
 
 #include <list>
 #include <memory>
+#include <utility>
 #include <vector>
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/basictypes.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/fec_test_helper.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 #include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
 
 namespace webrtc {
 
 namespace {
 constexpr int kFecPayloadType = 96;
 constexpr int kRedPayloadType = 97;
+constexpr uint32_t kMediaSsrc = 835424;
 }  // namespace
 
-using ::webrtc::test::fec::RawRtpPacket;
-using ::webrtc::test::fec::UlpfecPacketGenerator;
+using ::webrtc::test::fec::AugmentedPacket;

[philipel, 2016/09/22 11:29:30]

remove ::webrtc::

[brandtr, 2016/09/22 14:21:39]

Already done in upstream CL:
https://codereview.webrtc.org/2273353002/diff/180001/webrtc/modules/rtp_rtcp/...

+using ::webrtc::test::fec::AugmentedPacketGenerator;
 
 void VerifyHeader(uint16_t seq_num,
                   uint32_t timestamp,
                   int red_payload_type,
                   int fec_payload_type,
                   RedPacket* packet,
                   bool marker_bit) {
   EXPECT_GT(packet->length(), kRtpHeaderSize);
   EXPECT_TRUE(packet->data() != NULL);
   uint8_t* data = packet->data();
   // Marker bit not set.
   EXPECT_EQ(marker_bit ? 0x80 : 0, data[1] & 0x80);
   EXPECT_EQ(red_payload_type, data[1] & 0x7F);
   EXPECT_EQ(seq_num, (data[2] << 8) + data[3]);
   uint32_t parsed_timestamp =
       (data[4] << 24) + (data[5] << 16) + (data[6] << 8) + data[7];
   EXPECT_EQ(timestamp, parsed_timestamp);
   EXPECT_EQ(static_cast<uint8_t>(fec_payload_type), data[kRtpHeaderSize]);
 }
 
 class ProducerFecTest : public ::testing::Test {
  protected:
+  ProducerFecTest() : packet_generator_(kMediaSsrc) {}
+
   ProducerFec producer_;
-  UlpfecPacketGenerator generator_;
+  AugmentedPacketGenerator packet_generator_;
 };
 
 // Verifies bug found via fuzzing, where a gap in the packet sequence caused us
 // to move past the end of the current FEC packet mask byte without moving to
 // the next byte. That likely caused us to repeatedly read from the same byte,
 // and if that byte didn't protect packets we would generate empty FEC.
 TEST_F(ProducerFecTest, NoEmptyFecWithSeqNumGaps) {
   struct Packet {
     size_t header_size;
     size_t payload_size;
@@ skipping 34 matching lines @@
 
 TEST_F(ProducerFecTest, OneFrameFec) {
   // The number of media packets (|kNumPackets|), number of frames (one for
   // this test), and the protection factor (|params->fec_rate|) are set to make
   // sure the conditions for generating FEC are satisfied. This means:
   // (1) protection factor is high enough so that actual overhead over 1 frame
   // of packets is within |kMaxExcessOverhead|, and (2) the total number of
   // media packets for 1 frame is at least |minimum_media_packets_fec_|.
   constexpr size_t kNumPackets = 4;
   FecProtectionParams params = {15, 3, kFecMaskRandom};
-  std::list<RawRtpPacket*> rtp_packets;
-  generator_.NewFrame(kNumPackets);
+  packet_generator_.NewFrame(kNumPackets);
   producer_.SetFecParameters(&params, 0);  // Expecting one FEC packet.
   uint32_t last_timestamp = 0;
   for (size_t i = 0; i < kNumPackets; ++i) {
-    RawRtpPacket* rtp_packet = generator_.NextPacket(i, 10);
-    rtp_packets.push_back(rtp_packet);
+    std::unique_ptr<AugmentedPacket> packet =
+        packet_generator_.NextPacket(i, 10);
     EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec(
-                     rtp_packet->data, rtp_packet->length, kRtpHeaderSize));
-    last_timestamp = rtp_packet->header.header.timestamp;
+                     packet->data, packet->length, kRtpHeaderSize));
+    last_timestamp = packet->header.header.timestamp;
   }
   EXPECT_TRUE(producer_.FecAvailable());
-  uint16_t seq_num = generator_.NextSeqNum();
-  std::vector<std::unique_ptr<RedPacket>> packets =
+  uint16_t seq_num = packet_generator_.NextSeqNum();
+  std::vector<std::unique_ptr<RedPacket>> red_packets =
       producer_.GetFecPacketsAsRed(kRedPayloadType, kFecPayloadType, seq_num,
                                    kRtpHeaderSize);
   EXPECT_FALSE(producer_.FecAvailable());
-  ASSERT_EQ(1u, packets.size());
+  ASSERT_EQ(1u, red_packets.size());
   VerifyHeader(seq_num, last_timestamp, kRedPayloadType, kFecPayloadType,
-               packets.front().get(), false);
-  while (!rtp_packets.empty()) {
-    delete rtp_packets.front();
-    rtp_packets.pop_front();
-  }
+               red_packets.front().get(), false);
 }
 
 TEST_F(ProducerFecTest, TwoFrameFec) {
   // The number of media packets/frame (|kNumPackets|), the number of frames
   // (|kNumFrames|), and the protection factor (|params->fec_rate|) are set to
   // make sure the conditions for generating FEC are satisfied. This means:
   // (1) protection factor is high enough so that actual overhead over
   // |kNumFrames| is within |kMaxExcessOverhead|, and (2) the total number of
   // media packets for |kNumFrames| frames is at least
   // |minimum_media_packets_fec_|.
   constexpr size_t kNumPackets = 2;
   constexpr size_t kNumFrames = 2;
 
   FecProtectionParams params = {15, 3, kFecMaskRandom};
-  std::list<RawRtpPacket*> rtp_packets;
   producer_.SetFecParameters(&params, 0);  // Expecting one FEC packet.
   uint32_t last_timestamp = 0;
   for (size_t i = 0; i < kNumFrames; ++i) {
-    generator_.NewFrame(kNumPackets);
+    packet_generator_.NewFrame(kNumPackets);
     for (size_t j = 0; j < kNumPackets; ++j) {
-      RawRtpPacket* rtp_packet = generator_.NextPacket(i * kNumPackets + j, 10);
-      rtp_packets.push_back(rtp_packet);
+      std::unique_ptr<AugmentedPacket> packet =
+          packet_generator_.NextPacket(i * kNumPackets + j, 10);
       EXPECT_EQ(0, producer_.AddRtpPacketAndGenerateFec(
-                       rtp_packet->data, rtp_packet->length, kRtpHeaderSize));
-      last_timestamp = rtp_packet->header.header.timestamp;
+                       packet->data, packet->length, kRtpHeaderSize));
+      last_timestamp = packet->header.header.timestamp;
     }
   }
   EXPECT_TRUE(producer_.FecAvailable());
-  uint16_t seq_num = generator_.NextSeqNum();
-  std::vector<std::unique_ptr<RedPacket>> packets =
+  uint16_t seq_num = packet_generator_.NextSeqNum();
+  std::vector<std::unique_ptr<RedPacket>> red_packets =
       producer_.GetFecPacketsAsRed(kRedPayloadType, kFecPayloadType, seq_num,
                                    kRtpHeaderSize);
   EXPECT_FALSE(producer_.FecAvailable());
-  ASSERT_EQ(1u, packets.size());
+  ASSERT_EQ(1u, red_packets.size());
   VerifyHeader(seq_num, last_timestamp, kRedPayloadType, kFecPayloadType,
-               packets.front().get(), false);
-  while (!rtp_packets.empty()) {
-    delete rtp_packets.front();
-    rtp_packets.pop_front();
-  }
+               red_packets.front().get(), false);
 }
 
 TEST_F(ProducerFecTest, BuildRedPacket) {
-  generator_.NewFrame(1);
-  RawRtpPacket* packet = generator_.NextPacket(0, 10);
+  packet_generator_.NewFrame(1);
+  std::unique_ptr<AugmentedPacket> packet = 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(),
                true);  // Marker bit set.
   for (int i = 0; i < 10; ++i) {
     EXPECT_EQ(i, red_packet->data()[kRtpHeaderSize + 1 + i]);
   }
-  delete packet;
 }
 
 TEST_F(ProducerFecTest, BuildRedPacketWithEmptyPayload) {
   constexpr size_t kNumFrames = 1;
   constexpr size_t kPayloadLength = 0;
   constexpr size_t kRedForFecHeaderLength = 1;
 
-  generator_.NewFrame(kNumFrames);
-  std::unique_ptr<RawRtpPacket> packet(
-      generator_.NextPacket(0, kPayloadLength));
+  packet_generator_.NewFrame(kNumFrames);
+  std::unique_ptr<AugmentedPacket> packet(
+      packet_generator_.NextPacket(0, kPayloadLength));
   std::unique_ptr<RedPacket> red_packet =
       ProducerFec::BuildRedPacket(packet->data, packet->length - kRtpHeaderSize,
                                   kRtpHeaderSize, kRedPayloadType);
   EXPECT_EQ(packet->length + kRedForFecHeaderLength, red_packet->length());
   VerifyHeader(packet->header.header.sequenceNumber,
                packet->header.header.timestamp, kRedPayloadType,
                packet->header.header.payloadType, red_packet.get(),
                true);  // Marker bit set.
 }
 
 }  // namespace webrtc