Implemented a new sequence number unwrapper in sequence_number_util.h.

webrtc/modules/video_coding/sequence_number_util_unittest.cc

Index: webrtc/modules/video_coding/sequence_number_util_unittest.cc
diff --git a/webrtc/modules/video_coding/sequence_number_util_unittest.cc b/webrtc/modules/video_coding/sequence_number_util_unittest.cc
index 1ed78b95b8772f99a56dc53c5884e83d5e9d66f9..690a1066acc3bad82fc1d340370f4e0ef0c46b30 100644
--- a/webrtc/modules/video_coding/sequence_number_util_unittest.cc
+++ b/webrtc/modules/video_coding/sequence_number_util_unittest.cc
@@ -209,4 +209,99 @@ TEST_F(TestSeqNumUtil, SeqNumComparatorWithDivisor) {
   }
 }
 
+TEST(SeqNumUnwrapper, NoBackWardWrap) {
+  SeqNumUnwrapper<uint8_t> unwrapper;
+  EXPECT_EQ(0U, unwrapper.Unwrap(0));
+
+  // Wrapping backward from 0 is not allowed, if that happens the
+  // SeqNumUnwrapper should have been constructed with a higher start value.
+  // unwrapper.Unwrap(255);

[terelius, 2017/07/24 13:35:39]

Should this really be commented? Did you intend to make a death test instead?

[philipel, 2017/07/24 14:46:43]

TIL, death tests :)

+}
+
+TEST(SeqNumUnwrapper, ForwardWrap) {
+  SeqNumUnwrapper<uint8_t> unwrapper;
+  EXPECT_EQ(0U, unwrapper.Unwrap(255));
+  EXPECT_EQ(1U, unwrapper.Unwrap(0));
+}
+
+TEST(SeqNumUnwrapper, ForwardWrapWithDivisor) {
+  SeqNumUnwrapper<uint8_t, 33> unwrapper;
+  EXPECT_EQ(0U, unwrapper.Unwrap(30));
+  EXPECT_EQ(6U, unwrapper.Unwrap(3));
+}
+
+TEST(SeqNumUnwrapper, BackWardWrap) {
+  SeqNumUnwrapper<uint8_t> unwrapper(10);
+  EXPECT_EQ(10U, unwrapper.Unwrap(0));
+  EXPECT_EQ(8U, unwrapper.Unwrap(254));
+}
+
+TEST(SeqNumUnwrapper, BackWardWrapWithDivisor) {
+  SeqNumUnwrapper<uint8_t, 33> unwrapper(10);
+  EXPECT_EQ(10U, unwrapper.Unwrap(0));
+  EXPECT_EQ(8U, unwrapper.Unwrap(31));
+}
+
+TEST(SeqNumUnwrapper, Unwrap) {
+  SeqNumUnwrapper<uint16_t> unwrapper;
+  const uint16_t kMax = std::numeric_limits<uint16_t>::max();
+  const uint16_t kMaxDist = kMax / 2 + 1;
+
+  EXPECT_EQ(0U, unwrapper.Unwrap(0));
+  EXPECT_EQ(kMaxDist, unwrapper.Unwrap(kMaxDist));
+  EXPECT_EQ(0U, unwrapper.Unwrap(0));
+
+  EXPECT_EQ(kMaxDist, unwrapper.Unwrap(kMaxDist));
+  EXPECT_EQ(kMax, unwrapper.Unwrap(kMax));
+  EXPECT_EQ(kMax + 1U, unwrapper.Unwrap(0));
+  EXPECT_EQ(kMax, unwrapper.Unwrap(kMax));
+  EXPECT_EQ(kMaxDist, unwrapper.Unwrap(kMaxDist));
+  EXPECT_EQ(0U, unwrapper.Unwrap(0));
+}
+
+TEST(SeqNumUnwrapper, UnwrapOddDivisor) {
+  SeqNumUnwrapper<uint8_t, 11> unwrapper(10);
+
+  EXPECT_EQ(10U, unwrapper.Unwrap(10));
+  EXPECT_EQ(11U, unwrapper.Unwrap(0));
+  EXPECT_EQ(16U, unwrapper.Unwrap(5));
+  EXPECT_EQ(21U, unwrapper.Unwrap(10));
+  EXPECT_EQ(22U, unwrapper.Unwrap(0));
+  EXPECT_EQ(17U, unwrapper.Unwrap(6));
+  EXPECT_EQ(12U, unwrapper.Unwrap(1));
+  EXPECT_EQ(7U, unwrapper.Unwrap(7));
+  EXPECT_EQ(2U, unwrapper.Unwrap(2));
+  EXPECT_EQ(0U, unwrapper.Unwrap(0));
+}
+
+TEST(SeqNumUnwrapper, ManyForwardWraps) {
+  const int kLargeNumber = 4711;
+  const int kMaxStep = kLargeNumber / 2;
+  const int kNumWraps = 100;
+  SeqNumUnwrapper<uint16_t, kLargeNumber> unwrapper;
+
+  uint16_t next_unwrap = 0;
+  uint64_t expected = 0;
+  for (int i = 0; i < kNumWraps * 2 + 1; ++i) {
+    EXPECT_EQ(expected, unwrapper.Unwrap(next_unwrap));
+    expected += kMaxStep;
+    next_unwrap = (next_unwrap + kMaxStep) % kLargeNumber;
+  }
+}
+
+TEST(SeqNumUnwrapper, ManyBackwardWraps) {
+  const int kLargeNumber = 4711;
+  const int kMaxStep = kLargeNumber / 2;
+  const int kNumWraps = 100;
+  SeqNumUnwrapper<uint16_t, kLargeNumber> unwrapper(kLargeNumber * kNumWraps);
+
+  uint16_t next_unwrap = 0;
+  uint64_t expected = kLargeNumber * kNumWraps;
+  for (uint16_t i = 0; i < kNumWraps * 2 + 1; ++i) {
+    EXPECT_EQ(expected, unwrapper.Unwrap(next_unwrap));
+    expected -= kMaxStep;
+    next_unwrap = (next_unwrap + kMaxStep + 1) % kLargeNumber;
+  }
+}
+
 }  // namespace webrtc