Generalize FEC header formatting. (pt. 4)

webrtc/modules/rtp_rtcp/source/fec_test_helper.h

Index: webrtc/modules/rtp_rtcp/source/fec_test_helper.h
diff --git a/webrtc/modules/rtp_rtcp/source/fec_test_helper.h b/webrtc/modules/rtp_rtcp/source/fec_test_helper.h
index 6af7f9cc7fdbdd81ccf2ce5b820de822808c994a..8cc853063f7e952c3525b64e7d7281becb7ff207 100644
--- a/webrtc/modules/rtp_rtcp/source/fec_test_helper.h
+++ b/webrtc/modules/rtp_rtcp/source/fec_test_helper.h
@@ -11,19 +11,24 @@
 #ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
 #define WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_
 
+#include "webrtc/base/basictypes.h"
+#include "webrtc/base/random.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 
 namespace webrtc {
 namespace test {
+
+// needed to not clash with another webrtc::FrameGenerator.
+namespace fec {
+
+constexpr uint8_t kFecPayloadType = 96;
+constexpr uint8_t kRedPayloadType = 97;
+constexpr uint8_t kVp8PayloadType = 120;
+
 struct RawRtpPacket : public ForwardErrorCorrection::Packet {
   WebRtcRTPHeader header;
 };
-}  // namespace test
-
-const uint8_t kFecPayloadType = 96;
-const uint8_t kRedPayloadType = 97;
-const uint8_t kVp8PayloadType = 120;
 
 class FrameGenerator {
  public:
@@ -33,16 +38,15 @@ class FrameGenerator {
 
   uint16_t NextSeqNum();
 
-  test::RawRtpPacket* NextPacket(int offset, size_t length);
+  RawRtpPacket* NextPacket(int offset, size_t length);
 
   // Creates a new RtpPacket with the RED header added to the packet.
-  test::RawRtpPacket* BuildMediaRedPacket(const test::RawRtpPacket* packet);
+  RawRtpPacket* BuildMediaRedPacket(const RawRtpPacket* packet);
 
   // Creates a new RtpPacket with FEC payload and red header. Does this by
   // creating a new fake media RtpPacket, clears the marker bit and adds a RED
   // header. Finally replaces the payload with the content of |packet->data|.
-  test::RawRtpPacket* BuildFecRedPacket(
-      const ForwardErrorCorrection::Packet* packet);
+  RawRtpPacket* BuildFecRedPacket(const ForwardErrorCorrection::Packet* packet);
 
   void SetRedHeader(ForwardErrorCorrection::Packet* red_packet,
                     uint8_t payload_type,
@@ -55,6 +59,37 @@ class FrameGenerator {
   uint16_t seq_num_;
   uint32_t timestamp_;
 };
+
+class MediaPacketGenerator {

[danilchap, 2016/08/22 13:00:41]

Can you comment why do you need 2 packet generators?

[brandtr, 2016/08/23 08:19:10]

I think you mean why both FrameGenerator and MediaPacketGenerator are needed?

MediaPacketGenerator is just moved (this is now done in this CL:
https://codereview.webrtc.org/2267393002/) from rtp_fec_unittest.cc, which is
the only place it was used before. Now it is used by the
fec_header_reader_writer_unittest.cc.

FrameGenerator is used by the FecReceiver/ProducerFec unit tests.

I agree that it seems that these are sort of duplicated efforts, so they could
probably be merged. That might be the point of another CL though.

+ public:
+  MediaPacketGenerator(uint32_t min_packet_size,
+                       uint32_t max_packet_size,
+                       Random* random)
+      : min_packet_size_(min_packet_size),
+        max_packet_size_(max_packet_size),
+        random_(random) {}
+
+  // Construct the media packets, up to |num_media_packets| packets.
+  void ConstructMediaPacketsSeqNum(int num_media_packets,
+                                   uint16_t start_seq_num);
+  void ConstructMediaPackets(int num_media_packets);
+
+  ForwardErrorCorrection::PacketList* GetMediaPackets();
+  uint32_t GetSsrc();
+  uint16_t GetFecSeqNum();
+
+ private:
+  uint32_t min_packet_size_;
+  uint32_t max_packet_size_;
+  Random* random_;
+
+  ForwardErrorCorrection::PacketList media_packets_;
+  uint32_t ssrc_;
+  uint16_t fec_seq_num_;
+};
+
+}  // namespace fec
+}  // namespace test
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_FEC_TEST_HELPER_H_