zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split out counting unique rtp timestamps from packet_buffer

Browse Source 
Bug: None
Change-Id: Ia6fd05f284e8304cf56ab9ddf944fb222a4c9573
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158676
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: Philip Eliasson <philipel@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#29656}
This commit is contained in:
Danil Chapovalov
2019-10-30 14:12:24 +01:00
committed by Commit Bot
parent a0adf3d440
commit 09860e0bc3
9 changed files with 149 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
modules/video_coding/packet_buffer_unittest.cc
View File

@ -225,57 +225,6 @@ TEST_F(PacketBufferTest, FrameSize) {
ElementsAre(Pointee(SizeIs(20))));
}
TEST_F(PacketBufferTest, CountsUniqueFrames) {
const uint16_t seq_num = Rand();
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 0);
Insert(seq_num, kKeyFrame, kFirst, kNotLast, 0, nullptr, 100);
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 1);
// Still the same frame.
Insert(seq_num + 1, kKeyFrame, kNotFirst, kLast, 0, nullptr, 100);
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 1);
// Second frame.
Insert(seq_num + 2, kKeyFrame, kFirst, kNotLast, 0, nullptr, 200);
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 2);
Insert(seq_num + 3, kKeyFrame, kNotFirst, kLast, 0, nullptr, 200);
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 2);
// Old packet.
Insert(seq_num + 1, kKeyFrame, kNotFirst, kLast, 0, nullptr, 100);
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 2);
// Missing middle packet.
Insert(seq_num + 4, kKeyFrame, kFirst, kNotLast, 0, nullptr, 300);
Insert(seq_num + 6, kKeyFrame, kNotFirst, kLast, 0, nullptr, 300);
ASSERT_EQ(packet_buffer_.GetUniqueFramesSeen(), 3);
}
TEST_F(PacketBufferTest, HasHistoryOfUniqueFrames) {
const int kNumFrames = 1500;
const int kRequiredHistoryLength = 1000;
const uint16_t seq_num = Rand();
const uint32_t timestamp = 0xFFFFFFF0; // Large enough to cause wrap-around.
for (int i = 0; i < kNumFrames; ++i) {
Insert(seq_num + i, kKeyFrame, kFirst, kNotLast, 0, nullptr,
timestamp + 10 * i);
}
EXPECT_EQ(packet_buffer_.GetUniqueFramesSeen(), kNumFrames);
// Old packets within history should not affect number of seen unique frames.
for (int i = kNumFrames - kRequiredHistoryLength; i < kNumFrames; ++i) {
Insert(seq_num + i, kKeyFrame, kFirst, kNotLast, 0, nullptr,
timestamp + 10 * i);
}
EXPECT_EQ(packet_buffer_.GetUniqueFramesSeen(), kNumFrames);
// Very old packets should be treated as unique.
Insert(seq_num, kKeyFrame, kFirst, kNotLast, 0, nullptr, timestamp);
EXPECT_EQ(packet_buffer_.GetUniqueFramesSeen(), kNumFrames + 1);
}
TEST_F(PacketBufferTest, ExpandBuffer) {
const uint16_t seq_num = Rand();