Generalize FEC header formatting. (pt. 4)

webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc

Index: webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
index f27ca0442b39357a0041ed33c61dc893b51dda77..4169d3d2643fa06d25ba3becef46f32eb9000812 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc
@@ -18,6 +18,7 @@
 #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/ulpfec_header_reader_writer.h"
 
 namespace webrtc {
 
@@ -46,6 +47,15 @@ void DeepCopyEveryNthPacket(const ForwardErrorCorrection::PacketList& src,
 
 using ::testing::Types;
 
+// Subclass ForwardErrorCorrection to use gTest typed tests.
+class UlpfecForwardErrorCorrection : public ForwardErrorCorrection {

[danilchap, 2016/08/24 10:42:40]

using both fec and ForwardErrorCorrection in same name feels redundant.
Few alternatives suggestions:
UlpForwardErrorCorrection 
UlpFec
ForwardErrorCorrectionUlp
TestUlpFec

[brandtr, 2016/08/24 11:34:24]

In one sense, the naming is redundant, but in another it is not. Anyway, this
naming is temporary. ForwardErrorCorrection will be renamed ParityErasureCode,
and then this class will be called UlpfecParityErasureCode. "Ulpfec" then means
that this does header formatting per RFC 5109, and "ParityErasureCode" means
that this is a simple XOR-based rectangular code.

"ForwardErrorCorrection" is a very undescriptive name for this class to start
with.

I decided to do the renaming at the end of the FlexFEC process, after I'm sure
that I'm giving things their right names. 

+ public:
+  UlpfecForwardErrorCorrection()
+      : ForwardErrorCorrection(
+            std::unique_ptr<FecHeaderReader>(new UlpfecHeaderReader()),
+            std::unique_ptr<FecHeaderWriter>(new UlpfecHeaderWriter())) {}
+};
+
 template <typename ForwardErrorCorrectionType>
 class RtpFecTest : public ::testing::Test {
  protected:
@@ -86,15 +96,15 @@ class RtpFecTest : public ::testing::Test {
   ForwardErrorCorrection::ReceivedPacketList received_packets_;
   ForwardErrorCorrection::RecoveredPacketList recovered_packets_;
 
-  int media_loss_mask_[ForwardErrorCorrection::kMaxMediaPackets];
-  int fec_loss_mask_[ForwardErrorCorrection::kMaxMediaPackets];
+  int media_loss_mask_[kUlpfecMaxMediaPackets];
+  int fec_loss_mask_[kUlpfecMaxMediaPackets];
 };
 
 // Define gTest typed test to loop over both ULPFEC and FlexFEC.
 // Since the tests now are parameterized, we need to access
 // member variables using |this|, thereby enforcing runtime
 // resolution.
-using FecTypes = Types<ForwardErrorCorrection>;
+using FecTypes = Types<UlpfecForwardErrorCorrection>;
 TYPED_TEST_CASE(RtpFecTest, FecTypes);
 
 TYPED_TEST(RtpFecTest, FecRecoveryNoLoss) {