Index: webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc |
index 3f6de76aed2aef31f405eb34d54dfc431c48c43f..9ce7a1859967e8c831162a7dd941cd2fdfa4e9d2 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_format_vp8_unittest.cc |
@@ -95,7 +95,6 @@ class RtpPacketizerVp8Test : public ::testing::Test { |
helper_ = new test::RtpFormatVp8TestHelper(&hdr_info_); |
return helper_->Init(partition_sizes, num_partitions); |
} |
- |
RTPVideoHeaderVP8 hdr_info_; |
test::RtpFormatVp8TestHelper* helper_; |
}; |
@@ -530,6 +529,84 @@ TEST_F(RtpPacketizerVp8Test, TestTIDAndKeyIdx) { |
kExpectedNum); |
} |
+TEST_F(RtpPacketizerVp8Test, RetransmitNoTL) { |
+ hdr_info_.temporalIdx = kNoTemporalIdx; |
+ RtpPacketizerVp8 packetizer(hdr_info_, 1500, 0, kAggregate); |
+ |
+ EXPECT_EQ(kDontRetransmit, packetizer.GetStorageType(kRetransmitOff)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitBaseLayer)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitAllPackets)); |
+} |
+ |
+TEST_F(RtpPacketizerVp8Test, RetransmitTL0) { |
+ hdr_info_.temporalIdx = 0; |
+ RtpPacketizerVp8 packetizer(hdr_info_, 1500, 0, kAggregate); |
+ |
+ EXPECT_EQ(kDontRetransmit, packetizer.GetStorageType(kRetransmitOff)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitBaseLayer)); |
+ EXPECT_EQ(kDontRetransmit, |
+ packetizer.GetStorageType(kRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitBaseLayer | |
+ kRetransmitHigherLayers)); |
+ EXPECT_EQ(kDontRetransmit, |
+ packetizer.GetStorageType(kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitBaseLayer | |
+ kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitAllPackets)); |
+} |
+ |
+TEST_F(RtpPacketizerVp8Test, RetransmitTL1_2) { |
danilchap
2017/08/29 17:31:19
_ is discouraged in test names.
https://github.com
sprang_webrtc
2017/08/31 15:54:28
Done.
|
+ for (int tid = 1; tid <= 2; ++tid) { |
+ hdr_info_.temporalIdx = tid; |
+ RtpPacketizerVp8 packetizer(hdr_info_, 1500, 0, kAggregate); |
+ |
+ EXPECT_EQ(kDontRetransmit, packetizer.GetStorageType(kRetransmitOff)); |
+ EXPECT_EQ(kDontRetransmit, packetizer.GetStorageType(kRetransmitBaseLayer)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitBaseLayer | |
+ kRetransmitHigherLayers)); |
+ EXPECT_EQ(kDontRetransmit, |
+ packetizer.GetStorageType(kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kDontRetransmit, |
+ packetizer.GetStorageType(kRetransmitBaseLayer | |
+ kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitAllPackets)); |
+ } |
+} |
+ |
+TEST_F(RtpPacketizerVp8Test, RetransmitTL3) { |
danilchap
2017/08/29 17:31:19
how TL3 is different from TL2/TL1?
sprang_webrtc
2017/08/31 15:54:28
It was only different in an earlier revision of th
|
+ hdr_info_.temporalIdx = 3; |
+ RtpPacketizerVp8 packetizer(hdr_info_, 1500, 0, kAggregate); |
+ |
+ EXPECT_EQ(kDontRetransmit, packetizer.GetStorageType(kRetransmitOff)); |
+ EXPECT_EQ(kDontRetransmit, packetizer.GetStorageType(kRetransmitBaseLayer)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitBaseLayer | |
+ kRetransmitHigherLayers)); |
+ EXPECT_EQ(kDontRetransmit, |
+ packetizer.GetStorageType(kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kDontRetransmit, |
+ packetizer.GetStorageType(kRetransmitBaseLayer | |
+ kConditionallyRetransmitHigherLayers)); |
+ EXPECT_EQ(kAllowRetransmission, |
+ packetizer.GetStorageType(kRetransmitAllPackets)); |
+} |
+ |
class RtpDepacketizerVp8Test : public ::testing::Test { |
protected: |
RtpDepacketizerVp8Test() |