Chromium Code Reviews Chromium Code Reviews
Issue 2101253002:
Unit test for media packet reordering in ForwardErrorCorrection. (Closed)
Base URL: https://chromium.googlesource.com/external/webrtc.git@flexfec-pt1c_renames-and-fixes| 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 198877df26f20e1847cefc202d5976dd5a37c788..29824725d97b40117435d04b9f7ba6f42f6ac9bf 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_fec_unittest.cc |
| @@ -19,13 +19,14 @@ |
| using webrtc::ForwardErrorCorrection; |
| // Minimum RTP header size in bytes. |
| -const uint8_t kRtpHeaderSize = 12; |
| +constexpr uint8_t kRtpHeaderSize = 12; |
| // Transport header size in bytes. Assume UDP/IPv4 as a reasonable minimum. |
| -const uint8_t kTransportOverhead = 28; |
| +constexpr uint8_t kTransportOverhead = 28; |
| // Maximum number of media packets used in the FEC (RFC 5109). |
| -const uint8_t kMaxNumberMediaPackets = ForwardErrorCorrection::kMaxMediaPackets; |
| +constexpr uint8_t kMaxNumberMediaPackets = |
| + ForwardErrorCorrection::kMaxMediaPackets; |
| using PacketList = ForwardErrorCorrection::PacketList; |
| using ReceivedPacketList = ForwardErrorCorrection::ReceivedPacketList; |
| @@ -44,36 +45,22 @@ class RtpFecTest : public ::testing::Test { |
| protected: |
| RtpFecTest() |
| : random_(0xfec133700742), |
| - fec_(new ForwardErrorCorrection()), |
| ssrc_(random_.Rand<uint32_t>()), |
| fec_seq_num_(0) {} |
| - webrtc::Random random_; |
| - ForwardErrorCorrection* fec_; |
| - int ssrc_; |
| - uint16_t fec_seq_num_; |
| - |
| - PacketList media_packet_list_; |
| - PacketList fec_packet_list_; |
| - ReceivedPacketList received_packet_list_; |
| - RecoveredPacketList recovered_packet_list_; |
| - |
| - // Media packet "i" is lost if media_loss_mask_[i] = 1, |
| - // received if media_loss_mask_[i] = 0. |
| - int media_loss_mask_[kMaxNumberMediaPackets]; |
| - |
| - // FEC packet "i" is lost if fec_loss_mask_[i] = 1, |
| - // received if fec_loss_mask_[i] = 0. |
| - int fec_loss_mask_[kMaxNumberMediaPackets]; |
| - |
| - // Construct the media packet list, up to |num_media_packets| packets. |
| + // Construct |media_packet_list_|, up to |num_media_packets| packets. |
| // Returns the next sequence number after the last media packet. |
| // (this will be the sequence of the first FEC packet) |
| int ConstructMediaPacketsSeqNum(int num_media_packets, int start_seq_num); |
| int ConstructMediaPackets(int num_media_packets); |
| - // Construct the received packet list: a subset of the media and FEC packets. |
| - void NetworkReceivedPackets(); |
| + // Construct |received_packet_list_|: a subset of the media and FEC packets. |
| + // |
| + // Media packet "i" is lost if media_loss_mask_[i] = 1, received if |
| + // media_loss_mask_[i] = 0. |
| + // FEC packet "i" is lost if fec_loss_mask_[i] = 1, received if |
| + // fec_loss_mask_[i] = 0. |
| + void NetworkReceivedPackets(int* media_loss_mask, int* fec_loss_mask); |
| // Add packet from |packet_list| to list of received packets, using the |
| // |loss_mask|. |
| @@ -90,29 +77,42 @@ class RtpFecTest : public ::testing::Test { |
| // Delete the media and FEC packets. |
| void TearDown(); |
| + |
| + webrtc::Random random_; |
| + ForwardErrorCorrection fec_; |
| + int ssrc_; |
| + uint16_t fec_seq_num_; |
| + |
| + PacketList media_packet_list_; |
| + PacketList fec_packet_list_; |
| + ReceivedPacketList received_packet_list_; |
| + RecoveredPacketList recovered_packet_list_; |
| + |
| + int media_loss_mask_[kMaxNumberMediaPackets]; |
| + int fec_loss_mask_[kMaxNumberMediaPackets]; |
| }; |
| TEST_F(RtpFecTest, FecRecoveryNoLoss) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 4; |
| - uint8_t kProtectionFactor = 60; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 60; |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // No packets lost. |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // No packets lost, expect complete recovery. |
| @@ -120,28 +120,28 @@ TEST_F(RtpFecTest, FecRecoveryNoLoss) { |
| } |
| TEST_F(RtpFecTest, FecRecoveryWithLoss) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 4; |
| - uint8_t kProtectionFactor = 60; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 60; |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // 1 media packet lost |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // One packet lost, one FEC packet, expect complete recovery. |
| EXPECT_TRUE(IsRecoveryComplete()); |
| @@ -152,9 +152,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss) { |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[1] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
|
danilchap
2016/07/22 12:38:21
realign (or just call 'git cl format' since there
brandtr
2016/07/22 12:58:27
Ran 'git cl format'.
|
| // 2 packets lost, one FEC packet, cannot get complete recovery. |
| @@ -163,9 +163,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss) { |
| // Verify that we don't use an old FEC packet for FEC decoding. |
| TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapTwoFrames) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - uint8_t kProtectionFactor = 20; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr uint8_t kProtectionFactor = 20; |
| // Two frames: first frame (old) with two media packets and 1 FEC packet. |
| // Second frame (new) with 3 media packets, and no FEC packets. |
| @@ -177,11 +177,11 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapTwoFrames) { |
| // Construct media packets for first frame, starting at sequence number 0. |
| fec_seq_num_ = ConstructMediaPacketsSeqNum(2, 0); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // Add FEC packet (seq#2) of this first frame to received list (i.e., assume |
| // the two media packet were lost). |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| @@ -192,7 +192,7 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapTwoFrames) { |
| fec_seq_num_ = ConstructMediaPacketsSeqNum(3, 65535); |
| // Expect 3 media packets for this frame. |
| - EXPECT_EQ(3, static_cast<int>(media_packet_list_.size())); |
| + EXPECT_EQ(3u, media_packet_list_.size()); |
| // Second media packet lost (seq#0). |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -201,34 +201,34 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapTwoFrames) { |
| ReceivedPackets(media_packet_list_, media_loss_mask_, false); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // Expect that no decoding is done to get missing packet (seq#0) of second |
| // frame, using old FEC packet (seq#2) from first (old) frame. So number of |
| // recovered packets is 2, and not equal to number of media packets (=3). |
| - EXPECT_EQ(2, static_cast<int>(recovered_packet_list_.size())); |
| + EXPECT_EQ(2u, recovered_packet_list_.size()); |
| EXPECT_TRUE(recovered_packet_list_.size() != media_packet_list_.size()); |
| FreeRecoveredPacketList(); |
| } |
| -// Verify we can still recovery frame if sequence number wrap occurs within |
| +// Verify we can still recover frame if sequence number wrap occurs within |
| // the frame and FEC packet following wrap is received after media packets. |
| TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapOneFrameRecovery) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - uint8_t kProtectionFactor = 20; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr uint8_t kProtectionFactor = 20; |
| // One frame, with sequence number wrap in media packets. |
| // -----Frame 1---- |
| // #65534(media) #65535(media) #0(media) #1(FEC). |
| fec_seq_num_ = ConstructMediaPacketsSeqNum(3, 65534); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // Lose one media packet (seq# 65535). |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -239,11 +239,11 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapOneFrameRecovery) { |
| ReceivedPackets(fec_packet_list_, fec_loss_mask_, true); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // Expect 3 media packets in recovered list, and complete recovery. |
| // Wrap-around won't remove FEC packet, as it follows the wrap. |
| - EXPECT_EQ(3, static_cast<int>(recovered_packet_list_.size())); |
| + EXPECT_EQ(3u, recovered_packet_list_.size()); |
| EXPECT_TRUE(IsRecoveryComplete()); |
| FreeRecoveredPacketList(); |
| } |
| @@ -255,9 +255,9 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapOneFrameRecovery) { |
| // is used to detect old FEC packets. |
| // TODO(marpan): Update test if wrap-around handling changes in FEC decoding. |
| TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapOneFrameNoRecovery) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - uint8_t kProtectionFactor = 200; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr uint8_t kProtectionFactor = 200; |
| // 1 frame: 3 media packets and 2 FEC packets. |
| // Sequence number wrap in FEC packets. |
| @@ -265,12 +265,12 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapOneFrameNoRecovery) { |
| // #65532(media) #65533(media) #65534(media) #65535(FEC) #0(FEC). |
| fec_seq_num_ = ConstructMediaPacketsSeqNum(3, 65532); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 2 FEC packets. |
| - EXPECT_EQ(2, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(2u, fec_packet_list_.size()); |
| // Lose the last two media packets (seq# 65533, 65534). |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -281,35 +281,73 @@ TEST_F(RtpFecTest, FecRecoveryWithSeqNumGapOneFrameNoRecovery) { |
| ReceivedPackets(fec_packet_list_, fec_loss_mask_, true); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // The two FEC packets are received and should allow for complete recovery, |
| // but because of the wrap the second FEC packet will be discarded, and only |
| // one media packet is recoverable. So exepct 2 media packets on recovered |
| // list and no complete recovery. |
| - EXPECT_EQ(2, static_cast<int>(recovered_packet_list_.size())); |
| + EXPECT_EQ(2u, recovered_packet_list_.size()); |
| EXPECT_TRUE(recovered_packet_list_.size() != media_packet_list_.size()); |
| EXPECT_FALSE(IsRecoveryComplete()); |
| FreeRecoveredPacketList(); |
| } |
| -// Verify we can still recovery frame if FEC is received before media packets. |
| +// Verify we can still recover frame if media packets are reordered. |
| +TEST_F(RtpFecTest, FecRecoveryWithMediaOutOfOrder) { |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr uint8_t kProtectionFactor = 20; |
| + |
| + // One frame: 3 media packets, 1 FEC packet. |
| + // -----Frame 1---- |
| + // #0(media) #1(media) #2(media) #3(FEC). |
| + fec_seq_num_ = ConstructMediaPacketsSeqNum(3, 0); |
| + |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| + kNumImportantPackets, kUseUnequalProtection, |
| + webrtc::kFecMaskBursty, &fec_packet_list_)); |
| + |
| + // Expect 1 FEC packet. |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| + |
| + // Lose one media packet (seq# 1). |
| + memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| + memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| + media_loss_mask_[1] = 1; |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| + |
| + // Reorder received media packets. |
| + auto it0 = received_packet_list_.begin(); |
| + auto it2 = received_packet_list_.begin(); |
| + it2++; |
| + std::swap(*it0, *it2); |
| + |
| + EXPECT_EQ(0, |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + |
| + // Expect 3 media packets in recovered list, and complete recovery. |
| + EXPECT_EQ(3u, recovered_packet_list_.size()); |
| + EXPECT_TRUE(IsRecoveryComplete()); |
| +} |
| + |
| +// Verify we can still recover frame if FEC is received before media packets. |
| TEST_F(RtpFecTest, FecRecoveryWithFecOutOfOrder) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - uint8_t kProtectionFactor = 20; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr uint8_t kProtectionFactor = 20; |
| // One frame: 3 media packets, 1 FEC packet. |
| // -----Frame 1---- |
| // #0(media) #1(media) #2(media) #3(FEC). |
| fec_seq_num_ = ConstructMediaPacketsSeqNum(3, 0); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // Lose one media packet (seq# 1). |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -321,10 +359,10 @@ TEST_F(RtpFecTest, FecRecoveryWithFecOutOfOrder) { |
| ReceivedPackets(media_packet_list_, media_loss_mask_, false); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // Expect 3 media packets in recovered list, and complete recovery. |
| - EXPECT_EQ(3, static_cast<int>(recovered_packet_list_.size())); |
| + EXPECT_EQ(3u, recovered_packet_list_.size()); |
| EXPECT_TRUE(IsRecoveryComplete()); |
| FreeRecoveredPacketList(); |
| } |
| @@ -333,10 +371,10 @@ TEST_F(RtpFecTest, FecRecoveryWithFecOutOfOrder) { |
| // a 50% non-consecutive loss which can be fully recovered, and a 50% |
| // consecutive loss which cannot be fully recovered. |
| TEST_F(RtpFecTest, FecRecoveryWithLoss50percRandomMask) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 4; |
| - const uint8_t kProtectionFactor = 255; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 255; |
| // Packet Mask for (4,4,0) code, from random mask table. |
| // (kNumMediaPackets = 4; num_fec_packets = 4, kNumImportantPackets = 0) |
| @@ -350,12 +388,12 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percRandomMask) { |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskRandom, &fec_packet_list_)); |
| // Expect 4 FEC packets. |
| - EXPECT_EQ(4, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(4u, fec_packet_list_.size()); |
| // 4 packets lost: 3 media packets (0, 2, 3), and one FEC packet (0) lost. |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -364,10 +402,10 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percRandomMask) { |
| media_loss_mask_[0] = 1; |
| media_loss_mask_[2] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // With media packet#1 and FEC packets #1, #2, #3, expect complete recovery. |
| EXPECT_TRUE(IsRecoveryComplete()); |
| @@ -380,9 +418,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percRandomMask) { |
| media_loss_mask_[1] = 1; |
| media_loss_mask_[2] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Cannot get complete recovery for this loss configuration with random mask. |
| @@ -393,10 +431,10 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percRandomMask) { |
| // two 50% consecutive losses which can be fully recovered, and one |
| // non-consecutive which cannot be fully recovered. |
| TEST_F(RtpFecTest, FecRecoveryWithLoss50percBurstyMask) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 4; |
| - const uint8_t kProtectionFactor = 255; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 255; |
| // Packet Mask for (4,4,0) code, from bursty mask table. |
| // (kNumMediaPackets = 4; num_fec_packets = 4, kNumImportantPackets = 0) |
| @@ -410,12 +448,12 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percBurstyMask) { |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 4 FEC packets. |
| - EXPECT_EQ(4, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(4u, fec_packet_list_.size()); |
| // 4 consecutive packets lost: media packets 0,1,2,3. |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -424,9 +462,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percBurstyMask) { |
| media_loss_mask_[1] = 1; |
| media_loss_mask_[2] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Expect complete recovery for consecutive packet loss <= 50%. |
| @@ -440,9 +478,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percBurstyMask) { |
| media_loss_mask_[1] = 1; |
| media_loss_mask_[2] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Expect complete recovery for consecutive packet loss <= 50%. |
| @@ -456,9 +494,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percBurstyMask) { |
| fec_loss_mask_[3] = 1; |
| media_loss_mask_[0] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Cannot get complete recovery for this loss configuration. |
| @@ -466,54 +504,54 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percBurstyMask) { |
| } |
| TEST_F(RtpFecTest, FecRecoveryNoLossUep) { |
| - const int kNumImportantPackets = 2; |
| - const bool kUseUnequalProtection = true; |
| - const int kNumMediaPackets = 4; |
| - const uint8_t kProtectionFactor = 60; |
| + constexpr int kNumImportantPackets = 2; |
| + constexpr bool kUseUnequalProtection = true; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 60; |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // No packets lost. |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| EXPECT_EQ(0, |
| - fec_->DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| + fec_.DecodeFec(&received_packet_list_, &recovered_packet_list_)); |
| // No packets lost, expect complete recovery. |
| EXPECT_TRUE(IsRecoveryComplete()); |
| } |
| TEST_F(RtpFecTest, FecRecoveryWithLossUep) { |
| - const int kNumImportantPackets = 2; |
| - const bool kUseUnequalProtection = true; |
| - const int kNumMediaPackets = 4; |
| - const uint8_t kProtectionFactor = 60; |
| + constexpr int kNumImportantPackets = 2; |
| + constexpr bool kUseUnequalProtection = true; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 60; |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // 1 media packet lost. |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // One packet lost, one FEC packet, expect complete recovery. |
| @@ -525,9 +563,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLossUep) { |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[1] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // 2 packets lost, one FEC packet, cannot get complete recovery. |
| @@ -536,10 +574,10 @@ TEST_F(RtpFecTest, FecRecoveryWithLossUep) { |
| // Test 50% protection with random mask type for UEP on. |
| TEST_F(RtpFecTest, FecRecoveryWithLoss50percUepRandomMask) { |
| - const int kNumImportantPackets = 1; |
| - const bool kUseUnequalProtection = true; |
| - const int kNumMediaPackets = 4; |
| - const uint8_t kProtectionFactor = 255; |
| + constexpr int kNumImportantPackets = 1; |
| + constexpr bool kUseUnequalProtection = true; |
| + constexpr int kNumMediaPackets = 4; |
| + constexpr uint8_t kProtectionFactor = 255; |
| // Packet Mask for (4,4,1) code, from random mask table. |
| // (kNumMediaPackets = 4; num_fec_packets = 4, kNumImportantPackets = 1) |
| @@ -553,12 +591,12 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percUepRandomMask) { |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| - EXPECT_EQ(0, fec_->GenerateFec(media_packet_list_, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(media_packet_list_, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskRandom, &fec_packet_list_)); |
| // Expect 4 FEC packets. |
| - EXPECT_EQ(4, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(4u, fec_packet_list_.size()); |
| // 4 packets lost: 3 media packets and FEC packet#1 lost. |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| @@ -567,9 +605,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percUepRandomMask) { |
| media_loss_mask_[0] = 1; |
| media_loss_mask_[2] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // With media packet#3 and FEC packets #0, #1, #3, expect complete recovery. |
| @@ -584,9 +622,9 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percUepRandomMask) { |
| media_loss_mask_[1] = 1; |
| media_loss_mask_[2] = 1; |
| media_loss_mask_[3] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Cannot get complete recovery for this loss configuration. |
| @@ -594,10 +632,10 @@ TEST_F(RtpFecTest, FecRecoveryWithLoss50percUepRandomMask) { |
| } |
| TEST_F(RtpFecTest, FecRecoveryNonConsecutivePackets) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 5; |
| - uint8_t kProtectionFactor = 60; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 5; |
| + constexpr uint8_t kProtectionFactor = 60; |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| @@ -610,20 +648,20 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePackets) { |
| if (i % 2 == 0) protected_media_packets.push_back(*it); |
| } |
| - EXPECT_EQ(0, fec_->GenerateFec(protected_media_packets, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(protected_media_packets, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 1 FEC packet. |
| - EXPECT_EQ(1, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(1u, fec_packet_list_.size()); |
| // 1 protected media packet lost |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[2] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // One packet lost, one FEC packet, expect complete recovery. |
| @@ -634,9 +672,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePackets) { |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[1] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Unprotected packet lost. Recovery not possible. |
| @@ -648,9 +686,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePackets) { |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[0] = 1; |
| media_loss_mask_[2] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // 2 protected packets lost, one FEC packet, cannot get complete recovery. |
| @@ -658,9 +696,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePackets) { |
| } |
| TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsExtension) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 21; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 21; |
| uint8_t kProtectionFactor = 127; |
| fec_seq_num_ = ConstructMediaPackets(kNumMediaPackets); |
| @@ -677,20 +715,20 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsExtension) { |
| // Zero column insertion will have to extend the size of the packet |
| // mask since the number of actual packets are 21, while the number |
| // of protected packets are 11. |
| - EXPECT_EQ(0, fec_->GenerateFec(protected_media_packets, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(protected_media_packets, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 5 FEC packet. |
| - EXPECT_EQ(5, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(5u, fec_packet_list_.size()); |
| // Last protected media packet lost |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[kNumMediaPackets - 1] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // One packet lost, one FEC packet, expect complete recovery. |
| @@ -701,9 +739,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsExtension) { |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[kNumMediaPackets - 2] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Unprotected packet lost. Recovery not possible. |
| @@ -719,9 +757,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsExtension) { |
| media_loss_mask_[kNumMediaPackets - 5] = 1; |
| media_loss_mask_[kNumMediaPackets - 3] = 1; |
| media_loss_mask_[kNumMediaPackets - 1] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // 5 protected packets lost, one FEC packet, cannot get complete recovery. |
| @@ -729,9 +767,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsExtension) { |
| } |
| TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsWrap) { |
| - const int kNumImportantPackets = 0; |
| - const bool kUseUnequalProtection = false; |
| - const int kNumMediaPackets = 21; |
| + constexpr int kNumImportantPackets = 0; |
| + constexpr bool kUseUnequalProtection = false; |
| + constexpr int kNumMediaPackets = 21; |
| uint8_t kProtectionFactor = 127; |
| fec_seq_num_ = ConstructMediaPacketsSeqNum(kNumMediaPackets, 0xFFFF - 5); |
| @@ -748,20 +786,20 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsWrap) { |
| // Zero column insertion will have to extend the size of the packet |
| // mask since the number of actual packets are 21, while the number |
| // of protected packets are 11. |
| - EXPECT_EQ(0, fec_->GenerateFec(protected_media_packets, kProtectionFactor, |
| + EXPECT_EQ(0, fec_.GenerateFec(protected_media_packets, kProtectionFactor, |
| kNumImportantPackets, kUseUnequalProtection, |
| webrtc::kFecMaskBursty, &fec_packet_list_)); |
| // Expect 5 FEC packet. |
| - EXPECT_EQ(5, static_cast<int>(fec_packet_list_.size())); |
| + EXPECT_EQ(5u, fec_packet_list_.size()); |
| // Last protected media packet lost |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[kNumMediaPackets - 1] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // One packet lost, one FEC packet, expect complete recovery. |
| @@ -772,9 +810,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsWrap) { |
| memset(media_loss_mask_, 0, sizeof(media_loss_mask_)); |
| memset(fec_loss_mask_, 0, sizeof(fec_loss_mask_)); |
| media_loss_mask_[kNumMediaPackets - 2] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // Unprotected packet lost. Recovery not possible. |
| @@ -790,9 +828,9 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsWrap) { |
| media_loss_mask_[kNumMediaPackets - 5] = 1; |
| media_loss_mask_[kNumMediaPackets - 3] = 1; |
| media_loss_mask_[kNumMediaPackets - 1] = 1; |
| - NetworkReceivedPackets(); |
| + NetworkReceivedPackets(media_loss_mask_, fec_loss_mask_); |
| - EXPECT_EQ(0, fec_->DecodeFec(&received_packet_list_, |
| + EXPECT_EQ(0, fec_.DecodeFec(&received_packet_list_, |
| &recovered_packet_list_)); |
| // 5 protected packets lost, one FEC packet, cannot get complete recovery. |
| @@ -800,8 +838,7 @@ TEST_F(RtpFecTest, FecRecoveryNonConsecutivePacketsWrap) { |
| } |
| void RtpFecTest::TearDown() { |
| - fec_->ResetState(&recovered_packet_list_); |
| - delete fec_; |
| + fec_.ResetState(&recovered_packet_list_); |
| FreeRecoveredPacketList(); |
| ClearList(&media_packet_list_); |
| EXPECT_TRUE(media_packet_list_.empty()); |
| @@ -835,10 +872,11 @@ bool RtpFecTest::IsRecoveryComplete() { |
| recovered_packet_list_.cbegin(), cmp); |
| } |
| -void RtpFecTest::NetworkReceivedPackets() { |
| - const bool kFecPacket = true; |
| - ReceivedPackets(media_packet_list_, media_loss_mask_, !kFecPacket); |
| - ReceivedPackets(fec_packet_list_, fec_loss_mask_, kFecPacket); |
| +void RtpFecTest::NetworkReceivedPackets(int* media_loss_mask, |
| + int* fec_loss_mask) { |
| + constexpr bool kFecPacket = true; |
| + ReceivedPackets(media_packet_list_, media_loss_mask, !kFecPacket); |
| + ReceivedPackets(fec_packet_list_, fec_loss_mask, kFecPacket); |
| } |
| void RtpFecTest::ReceivedPackets(const PacketList& packet_list, int* loss_mask, |
| @@ -887,7 +925,7 @@ int RtpFecTest::ConstructMediaPacketsSeqNum(int num_media_packets, |
| for (int i = 0; i < num_media_packets; ++i) { |
| media_packet = new ForwardErrorCorrection::Packet(); |
| media_packet_list_.push_back(media_packet); |
| - const uint32_t kMinPacketSize = kRtpHeaderSize; |
| + constexpr uint32_t kMinPacketSize = kRtpHeaderSize; |
| const uint32_t kMaxPacketSize = IP_PACKET_SIZE - kRtpHeaderSize - |
| kTransportOverhead - |
| ForwardErrorCorrection::PacketOverhead(); |
