commit bd3f30535c333d79806c23b7a2f7dd53d71ce689
author Johannes Kron <kron@webrtc.org> Thu Aug 01 15:45:54 2019 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Aug 01 14:35:54 2019 +0000
tree 289ac91f36f95593660089abd4e7bb12187b24b3
parent 77d3efc5097a6dde42bb1d3c5d9235bd5a925657

Request a new key frame if packet buffer is cleared

Bug: webrtc:10843
Change-Id: I1eab0891f3e68b7d504dc637790604a25c243856
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/147721
Commit-Queue: Johannes Kron <kron@webrtc.org>
Reviewed-by: Erik Språng <sprang@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28735}

modules/video_coding/video_packet_buffer_unittest.cc

diff --git a/modules/video_coding/video_packet_buffer_unittest.cc b/modules/video_coding/video_packet_buffer_unittest.cc
index d5432b8..f8d0bb8 100644
--- a/modules/video_coding/video_packet_buffer_unittest.cc
+++ b/modules/video_coding/video_packet_buffer_unittest.cc
@@ -153,7 +153,7 @@
   EXPECT_TRUE(Insert(seq_num + 2, kDeltaFrame, kFirst, kLast));
 
   packet_buffer_->ClearTo(seq_num + 2);
-  EXPECT_FALSE(Insert(seq_num + 2, kDeltaFrame, kFirst, kLast));
+  EXPECT_TRUE(Insert(seq_num + 2, kDeltaFrame, kFirst, kLast));
   EXPECT_TRUE(Insert(seq_num + 3, kDeltaFrame, kFirst, kLast));
   ASSERT_EQ(2UL, frames_from_callback_.size());
 }
@@ -246,21 +246,20 @@
   const uint32_t timestamp = 0xFFFFFFF0;  // Large enough to cause wrap-around.
 
   for (int i = 0; i < kNumFrames; ++i) {
-    EXPECT_TRUE(Insert(seq_num + i, kKeyFrame, kFirst, kNotLast, 0, nullptr,
-                       timestamp + 10 * i));
+    Insert(seq_num + i, kKeyFrame, kFirst, kNotLast, 0, nullptr,
+           timestamp + 10 * i);
   }
   ASSERT_EQ(kNumFrames, packet_buffer_->GetUniqueFramesSeen());
 
   // Old packets within history should not affect number of seen unique frames.
   for (int i = kNumFrames - kRequiredHistoryLength; i < kNumFrames; ++i) {
-    EXPECT_TRUE(Insert(seq_num + i, kKeyFrame, kFirst, kNotLast, 0, nullptr,
-                       timestamp + 10 * i));
+    Insert(seq_num + i, kKeyFrame, kFirst, kNotLast, 0, nullptr,
+           timestamp + 10 * i);
   }
   ASSERT_EQ(kNumFrames, packet_buffer_->GetUniqueFramesSeen());
 
   // Very old packets should be treated as unique.
-  EXPECT_TRUE(
-      Insert(seq_num, kKeyFrame, kFirst, kNotLast, 0, nullptr, timestamp));
+  Insert(seq_num, kKeyFrame, kFirst, kNotLast, 0, nullptr, timestamp);
   ASSERT_EQ(kNumFrames + 1, packet_buffer_->GetUniqueFramesSeen());
 }
 
@@ -289,7 +288,7 @@
 
   for (int i = 0; i < kMaxSize; ++i)
     EXPECT_TRUE(Insert(seq_num + i, kKeyFrame, kFirst, kLast));
-  EXPECT_TRUE(Insert(seq_num + kMaxSize + 1, kKeyFrame, kFirst, kLast));
+  EXPECT_FALSE(Insert(seq_num + kMaxSize + 1, kKeyFrame, kFirst, kLast));
 }
 
 TEST_F(TestPacketBuffer, OnePacketOneFrame) {
@@ -728,10 +727,10 @@
 
   // Expect to free data3 upon insertion (old packet).
   packet_buffer_->ClearTo(1);
-  EXPECT_FALSE(Insert(1, kKeyFrame, kFirst, kNotLast, 5, data3));
+  EXPECT_TRUE(Insert(1, kKeyFrame, kFirst, kNotLast, 5, data3));
 
   // Expect to free data4 upon insertion (packet buffer is full).
-  EXPECT_TRUE(Insert(2 + kMaxSize, kKeyFrame, kFirst, kNotLast, 5, data4));
+  EXPECT_FALSE(Insert(2 + kMaxSize, kKeyFrame, kFirst, kNotLast, 5, data4));
 }
 
 TEST_F(TestPacketBuffer, ContinuousSeqNumDoubleMarkerBit) {