VP8 ref finder unittest cleanup

Change-Id: I627dda1229ceb4b2da3f37f7418da7b7653e4d04
Bug: webrtc:12221
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208482
Commit-Queue: Philip Eliasson <philipel@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33362}
This commit is contained in:
philipel
2021-03-01 17:15:03 +01:00
committed by Commit Bot
parent 86f04ad135
commit 625e1d9b16
3 changed files with 364 additions and 433 deletions

View File

@ -95,25 +95,6 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
reference_finder_->ManageFrame(std::move(frame));
}
void InsertVp8(uint16_t seq_num_start,
uint16_t seq_num_end,
bool keyframe,
int32_t pid = kNoPictureId,
uint8_t tid = kNoTemporalIdx,
int32_t tl0 = kNoTl0PicIdx,
bool sync = false) {
RTPVideoHeaderVP8 vp8_header{};
vp8_header.pictureId = pid % (1 << 15);
vp8_header.temporalIdx = tid;
vp8_header.tl0PicIdx = tl0;
vp8_header.layerSync = sync;
std::unique_ptr<RtpFrameObject> frame = CreateFrame(
seq_num_start, seq_num_end, keyframe, kVideoCodecVP8, vp8_header);
reference_finder_->ManageFrame(std::move(frame));
}
void InsertH264(uint16_t seq_num_start, uint16_t seq_num_end, bool keyframe) {
std::unique_ptr<RtpFrameObject> frame =
CreateFrame(seq_num_start, seq_num_end, keyframe, kVideoCodecH264,
@ -151,11 +132,6 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
CheckReferences(pid, 0, refs...);
}
template <typename... T>
void CheckReferencesVp8(int64_t pid, T... refs) const {
CheckReferences(pid, 0, refs...);
}
template <typename... T>
void CheckReferencesH264(int64_t pid, T... refs) const {
CheckReferences(pid, 0, refs...);
@ -253,415 +229,6 @@ TEST_F(TestRtpFrameReferenceFinder, ClearTo) {
EXPECT_EQ(3UL, frames_from_callback_.size());
}
TEST_F(TestRtpFrameReferenceFinder, Vp8NoPictureId) {
uint16_t sn = Rand();
InsertVp8(sn, sn + 2, true);
ASSERT_EQ(1UL, frames_from_callback_.size());
InsertVp8(sn + 3, sn + 4, false);
ASSERT_EQ(2UL, frames_from_callback_.size());
InsertVp8(sn + 5, sn + 8, false);
ASSERT_EQ(3UL, frames_from_callback_.size());
InsertVp8(sn + 9, sn + 9, false);
ASSERT_EQ(4UL, frames_from_callback_.size());
InsertVp8(sn + 10, sn + 11, false);
ASSERT_EQ(5UL, frames_from_callback_.size());
InsertVp8(sn + 12, sn + 12, true);
ASSERT_EQ(6UL, frames_from_callback_.size());
InsertVp8(sn + 13, sn + 17, false);
ASSERT_EQ(7UL, frames_from_callback_.size());
InsertVp8(sn + 18, sn + 18, false);
ASSERT_EQ(8UL, frames_from_callback_.size());
InsertVp8(sn + 19, sn + 20, false);
ASSERT_EQ(9UL, frames_from_callback_.size());
InsertVp8(sn + 21, sn + 21, false);
ASSERT_EQ(10UL, frames_from_callback_.size());
CheckReferencesVp8(sn + 2);
CheckReferencesVp8(sn + 4, sn + 2);
CheckReferencesVp8(sn + 8, sn + 4);
CheckReferencesVp8(sn + 9, sn + 8);
CheckReferencesVp8(sn + 11, sn + 9);
CheckReferencesVp8(sn + 12);
CheckReferencesVp8(sn + 17, sn + 12);
CheckReferencesVp8(sn + 18, sn + 17);
CheckReferencesVp8(sn + 20, sn + 18);
CheckReferencesVp8(sn + 21, sn + 20);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8NoPictureIdReordered) {
uint16_t sn = 0xfffa;
InsertVp8(sn, sn + 2, true);
InsertVp8(sn + 3, sn + 4, false);
InsertVp8(sn + 5, sn + 8, false);
InsertVp8(sn + 9, sn + 9, false);
InsertVp8(sn + 10, sn + 11, false);
InsertVp8(sn + 12, sn + 12, true);
InsertVp8(sn + 13, sn + 17, false);
InsertVp8(sn + 18, sn + 18, false);
InsertVp8(sn + 19, sn + 20, false);
InsertVp8(sn + 21, sn + 21, false);
ASSERT_EQ(10UL, frames_from_callback_.size());
CheckReferencesVp8(sn + 2);
CheckReferencesVp8(sn + 4, sn + 2);
CheckReferencesVp8(sn + 8, sn + 4);
CheckReferencesVp8(sn + 9, sn + 8);
CheckReferencesVp8(sn + 11, sn + 9);
CheckReferencesVp8(sn + 12);
CheckReferencesVp8(sn + 17, sn + 12);
CheckReferencesVp8(sn + 18, sn + 17);
CheckReferencesVp8(sn + 20, sn + 18);
CheckReferencesVp8(sn + 21, sn + 20);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8KeyFrameReferences) {
uint16_t sn = Rand();
InsertVp8(sn, sn, true);
ASSERT_EQ(1UL, frames_from_callback_.size());
CheckReferencesVp8(sn);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8RepeatedFrame_0) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 1);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 0, 2);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 0, 2);
ASSERT_EQ(2UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8RepeatedFrameLayerSync_01) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 1);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 1, 1, true);
ASSERT_EQ(2UL, frames_from_callback_.size());
InsertVp8(sn + 1, sn + 1, false, pid + 1, 1, 1, true);
ASSERT_EQ(2UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8RepeatedFrame_01) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 1);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 0, 2, true);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 3);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 0, 4);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 0, 4);
ASSERT_EQ(4UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid + 1);
CheckReferencesVp8(pid + 3, pid + 2);
}
// Test with 1 temporal layer.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayers_0) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 1);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 0, 2);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 3);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 0, 4);
ASSERT_EQ(4UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid + 1);
CheckReferencesVp8(pid + 3, pid + 2);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8DuplicateTl1Frames) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 0);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 1, 0, true);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 1);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 1, 1);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 1, 1);
InsertVp8(sn + 4, sn + 4, false, pid + 4, 0, 2);
InsertVp8(sn + 5, sn + 5, false, pid + 5, 1, 2);
ASSERT_EQ(6UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 3, pid + 1, pid + 2);
CheckReferencesVp8(pid + 4, pid + 2);
CheckReferencesVp8(pid + 5, pid + 3, pid + 4);
}
// Test with 1 temporal layer.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersReordering_0) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 1);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 0, 2);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 0, 4);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 3);
InsertVp8(sn + 5, sn + 5, false, pid + 5, 0, 6);
InsertVp8(sn + 6, sn + 6, false, pid + 6, 0, 7);
InsertVp8(sn + 4, sn + 4, false, pid + 4, 0, 5);
ASSERT_EQ(7UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid + 1);
CheckReferencesVp8(pid + 3, pid + 2);
CheckReferencesVp8(pid + 4, pid + 3);
CheckReferencesVp8(pid + 5, pid + 4);
CheckReferencesVp8(pid + 6, pid + 5);
}
// Test with 2 temporal layers in a 01 pattern.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayers_01) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 255);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 1, 255, true);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 0);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 1, 0);
ASSERT_EQ(4UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 3, pid + 1, pid + 2);
}
// Test with 2 temporal layers in a 01 pattern.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersReordering_01) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn + 1, sn + 1, false, pid + 1, 1, 255, true);
InsertVp8(sn, sn, true, pid, 0, 255);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 1, 0);
InsertVp8(sn + 5, sn + 5, false, pid + 5, 1, 1);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 0);
InsertVp8(sn + 4, sn + 4, false, pid + 4, 0, 1);
InsertVp8(sn + 6, sn + 6, false, pid + 6, 0, 2);
InsertVp8(sn + 7, sn + 7, false, pid + 7, 1, 2);
ASSERT_EQ(8UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 3, pid + 1, pid + 2);
CheckReferencesVp8(pid + 4, pid + 2);
CheckReferencesVp8(pid + 5, pid + 3, pid + 4);
CheckReferencesVp8(pid + 6, pid + 4);
CheckReferencesVp8(pid + 7, pid + 5, pid + 6);
}
// Test with 3 temporal layers in a 0212 pattern.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayers_0212) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 55);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 2, 55, true);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 1, 55, true);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 2, 55);
InsertVp8(sn + 4, sn + 4, false, pid + 4, 0, 56);
InsertVp8(sn + 5, sn + 5, false, pid + 5, 2, 56);
InsertVp8(sn + 6, sn + 6, false, pid + 6, 1, 56);
InsertVp8(sn + 7, sn + 7, false, pid + 7, 2, 56);
InsertVp8(sn + 8, sn + 8, false, pid + 8, 0, 57);
InsertVp8(sn + 9, sn + 9, false, pid + 9, 2, 57, true);
InsertVp8(sn + 10, sn + 10, false, pid + 10, 1, 57, true);
InsertVp8(sn + 11, sn + 11, false, pid + 11, 2, 57);
ASSERT_EQ(12UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 3, pid, pid + 1, pid + 2);
CheckReferencesVp8(pid + 4, pid);
CheckReferencesVp8(pid + 5, pid + 2, pid + 3, pid + 4);
CheckReferencesVp8(pid + 6, pid + 2, pid + 4);
CheckReferencesVp8(pid + 7, pid + 4, pid + 5, pid + 6);
CheckReferencesVp8(pid + 8, pid + 4);
CheckReferencesVp8(pid + 9, pid + 8);
CheckReferencesVp8(pid + 10, pid + 8);
CheckReferencesVp8(pid + 11, pid + 8, pid + 9, pid + 10);
}
// Test with 3 temporal layers in a 0212 pattern.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersMissingFrame_0212) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 55, false);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 1, 55, true);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 2, 55, false);
ASSERT_EQ(2UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 2, pid);
}
// Test with 3 temporal layers in a 0212 pattern.
TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersReordering_0212) {
uint16_t pid = 126;
uint16_t sn = Rand();
InsertVp8(sn + 1, sn + 1, false, pid + 1, 2, 55, true);
InsertVp8(sn, sn, true, pid, 0, 55, false);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 1, 55, true);
InsertVp8(sn + 4, sn + 4, false, pid + 4, 0, 56, false);
InsertVp8(sn + 5, sn + 5, false, pid + 5, 2, 56, false);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 2, 55, false);
InsertVp8(sn + 7, sn + 7, false, pid + 7, 2, 56, false);
InsertVp8(sn + 9, sn + 9, false, pid + 9, 2, 57, true);
InsertVp8(sn + 6, sn + 6, false, pid + 6, 1, 56, false);
InsertVp8(sn + 8, sn + 8, false, pid + 8, 0, 57, false);
InsertVp8(sn + 11, sn + 11, false, pid + 11, 2, 57, false);
InsertVp8(sn + 10, sn + 10, false, pid + 10, 1, 57, true);
ASSERT_EQ(12UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 3, pid, pid + 1, pid + 2);
CheckReferencesVp8(pid + 4, pid);
CheckReferencesVp8(pid + 5, pid + 2, pid + 3, pid + 4);
CheckReferencesVp8(pid + 6, pid + 2, pid + 4);
CheckReferencesVp8(pid + 7, pid + 4, pid + 5, pid + 6);
CheckReferencesVp8(pid + 8, pid + 4);
CheckReferencesVp8(pid + 9, pid + 8);
CheckReferencesVp8(pid + 10, pid + 8);
CheckReferencesVp8(pid + 11, pid + 8, pid + 9, pid + 10);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8InsertManyFrames_0212) {
uint16_t pid = Rand();
uint16_t sn = Rand();
const int keyframes_to_insert = 50;
const int frames_per_keyframe = 120; // Should be a multiple of 4.
uint8_t tl0 = 128;
for (int k = 0; k < keyframes_to_insert; ++k) {
InsertVp8(sn, sn, true, pid, 0, tl0, false);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 2, tl0, true);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 1, tl0, true);
InsertVp8(sn + 3, sn + 3, false, pid + 3, 2, tl0, false);
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 3, pid, pid + 1, pid + 2);
frames_from_callback_.clear();
++tl0;
for (int f = 4; f < frames_per_keyframe; f += 4) {
uint16_t sf = sn + f;
int64_t pidf = pid + f;
InsertVp8(sf, sf, false, pidf, 0, tl0, false);
InsertVp8(sf + 1, sf + 1, false, pidf + 1, 2, tl0, false);
InsertVp8(sf + 2, sf + 2, false, pidf + 2, 1, tl0, false);
InsertVp8(sf + 3, sf + 3, false, pidf + 3, 2, tl0, false);
CheckReferencesVp8(pidf, pidf - 4);
CheckReferencesVp8(pidf + 1, pidf, pidf - 1, pidf - 2);
CheckReferencesVp8(pidf + 2, pidf, pidf - 2);
CheckReferencesVp8(pidf + 3, pidf, pidf + 1, pidf + 2);
frames_from_callback_.clear();
++tl0;
}
pid += frames_per_keyframe;
sn += frames_per_keyframe;
}
}
TEST_F(TestRtpFrameReferenceFinder, Vp8LayerSync) {
uint16_t pid = Rand();
uint16_t sn = Rand();
InsertVp8(sn, sn, true, pid, 0, 0, false);
InsertVp8(sn + 1, sn + 1, false, pid + 1, 1, 0, true);
InsertVp8(sn + 2, sn + 2, false, pid + 2, 0, 1, false);
ASSERT_EQ(3UL, frames_from_callback_.size());
InsertVp8(sn + 4, sn + 4, false, pid + 4, 0, 2, false);
InsertVp8(sn + 5, sn + 5, false, pid + 5, 1, 2, true);
InsertVp8(sn + 6, sn + 6, false, pid + 6, 0, 3, false);
InsertVp8(sn + 7, sn + 7, false, pid + 7, 1, 3, false);
ASSERT_EQ(7UL, frames_from_callback_.size());
CheckReferencesVp8(pid);
CheckReferencesVp8(pid + 1, pid);
CheckReferencesVp8(pid + 2, pid);
CheckReferencesVp8(pid + 4, pid + 2);
CheckReferencesVp8(pid + 5, pid + 4);
CheckReferencesVp8(pid + 6, pid + 4);
CheckReferencesVp8(pid + 7, pid + 6, pid + 5);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8Tl1SyncFrameAfterTl1Frame) {
InsertVp8(1000, 1000, true, 1, 0, 247, true);
InsertVp8(1001, 1001, false, 3, 0, 248, false);
InsertVp8(1002, 1002, false, 4, 1, 248, false); // Will be dropped
InsertVp8(1003, 1003, false, 5, 1, 248, true); // due to this frame.
ASSERT_EQ(3UL, frames_from_callback_.size());
CheckReferencesVp8(1);
CheckReferencesVp8(3, 1);
CheckReferencesVp8(5, 3);
}
TEST_F(TestRtpFrameReferenceFinder, Vp8DetectMissingFrame_0212) {
InsertVp8(1, 1, true, 1, 0, 1, false);
InsertVp8(2, 2, false, 2, 2, 1, true);
InsertVp8(3, 3, false, 3, 1, 1, true);
InsertVp8(4, 4, false, 4, 2, 1, false);
InsertVp8(6, 6, false, 6, 2, 2, false);
InsertVp8(7, 7, false, 7, 1, 2, false);
InsertVp8(8, 8, false, 8, 2, 2, false);
ASSERT_EQ(4UL, frames_from_callback_.size());
InsertVp8(5, 5, false, 5, 0, 2, false);
ASSERT_EQ(8UL, frames_from_callback_.size());
CheckReferencesVp8(1);
CheckReferencesVp8(2, 1);
CheckReferencesVp8(3, 1);
CheckReferencesVp8(4, 3, 2, 1);
CheckReferencesVp8(5, 1);
CheckReferencesVp8(6, 5, 4, 3);
CheckReferencesVp8(7, 5, 3);
CheckReferencesVp8(8, 7, 6, 5);
}
TEST_F(TestRtpFrameReferenceFinder, H264KeyFrameReferences) {
uint16_t sn = Rand();
InsertH264(sn, sn, true);