Revert "SeqNumUnwrapper::Unwrap now returns int64_t instead of uint64_t."
This reverts commit b0f968a761b715da4cf81e4b9c3cab0ccd322cf2. Reason for revert: Need to update DecodedFramesHistory to manage negative picture IDs. Original change's description: > SeqNumUnwrapper::Unwrap now returns int64_t instead of uint64_t. > > Bug: webrtc:10263 > Change-Id: Idaeae6be01bd4eba0691226c958d70e114161ffd > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127295 > Commit-Queue: Philip Eliasson <philipel@webrtc.org> > Reviewed-by: Johannes Kron <kron@webrtc.org> > Reviewed-by: Karl Wiberg <kwiberg@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#27129} TBR=kwiberg@webrtc.org,eladalon@webrtc.org,terelius@webrtc.org,philipel@webrtc.org,kron@webrtc.org Change-Id: I529bb0475bd21a80fa244278aff1fd912a85c169 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10263 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127885 Reviewed-by: Philip Eliasson <philipel@webrtc.org> Commit-Queue: Philip Eliasson <philipel@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27135}
This commit is contained in:
Philip Eliasson
committed by
Commit Bot
Commit Bot
parent
38e6c66f4a
commit
b5207b488b
@ -54,6 +54,8 @@ class FakePacketBuffer : public PacketBuffer {
|
||||
class TestRtpFrameReferenceFinder : public ::testing::Test,
|
||||
public OnCompleteFrameCallback {
|
||||
protected:
|
||||
static constexpr uint64_t kUnwrappedSequenceStart = 1000000000000000000UL;
|
||||
|
||||
TestRtpFrameReferenceFinder()
|
||||
: rand_(0x8739211),
|
||||
ref_packet_buffer_(new FakePacketBuffer()),
|
||||
@ -216,7 +218,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
|
||||
void CheckReferences(int64_t picture_id_offset,
|
||||
uint16_t sidx,
|
||||
T... refs) const {
|
||||
int64_t pid = picture_id_offset;
|
||||
int64_t pid = kUnwrappedSequenceStart + picture_id_offset;
|
||||
auto frame_it = frames_from_callback_.find(std::make_pair(pid, sidx));
|
||||
if (frame_it == frames_from_callback_.end()) {
|
||||
ADD_FAILURE() << "Could not find frame with (pid:sidx): (" << pid << ":"
|
||||
@ -251,7 +253,7 @@ class TestRtpFrameReferenceFinder : public ::testing::Test,
|
||||
|
||||
template <typename... T>
|
||||
void RefsToSet(std::set<int64_t>* m, int64_t ref, T... refs) const {
|
||||
m->insert(ref);
|
||||
m->insert(ref + kUnwrappedSequenceStart);
|
||||
RefsToSet(m, refs...);
|
||||
}
|
||||
|
||||
@ -292,8 +294,8 @@ TEST_F(TestRtpFrameReferenceFinder, PaddingPacketsReordered) {
|
||||
InsertGeneric(sn + 2, sn + 3, false);
|
||||
|
||||
EXPECT_EQ(2UL, frames_from_callback_.size());
|
||||
CheckReferencesGeneric(sn);
|
||||
CheckReferencesGeneric(sn + 3, sn + 0);
|
||||
CheckReferencesGeneric(0);
|
||||
CheckReferencesGeneric(3, 0);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, PaddingPacketsReorderedMultipleKeyframes) {
|
||||
@ -375,16 +377,16 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8NoPictureId) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(6, 2);
|
||||
CheckReferencesVp8(7, 6);
|
||||
CheckReferencesVp8(9, 7);
|
||||
CheckReferencesVp8(10);
|
||||
CheckReferencesVp8(15, 10);
|
||||
CheckReferencesVp8(16, 15);
|
||||
CheckReferencesVp8(18, 16);
|
||||
CheckReferencesVp8(19, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp8NoPictureIdReordered) {
|
||||
@ -402,16 +404,16 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8NoPictureIdReordered) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(6, 2);
|
||||
CheckReferencesVp8(7, 6);
|
||||
CheckReferencesVp8(9, 7);
|
||||
CheckReferencesVp8(10);
|
||||
CheckReferencesVp8(15, 10);
|
||||
CheckReferencesVp8(16, 15);
|
||||
CheckReferencesVp8(18, 16);
|
||||
CheckReferencesVp8(19, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp8KeyFrameReferences) {
|
||||
@ -419,7 +421,7 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8KeyFrameReferences) {
|
||||
InsertVp8(sn, sn, true);
|
||||
|
||||
ASSERT_EQ(1UL, frames_from_callback_.size());
|
||||
CheckReferencesVp8(sn);
|
||||
CheckReferencesVp8(0);
|
||||
}
|
||||
|
||||
// Test with 1 temporal layer.
|
||||
@ -433,10 +435,10 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayers_0) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 1);
|
||||
CheckReferencesVp8(3, 2);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp8DuplicateTl1Frames) {
|
||||
@ -452,12 +454,12 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8DuplicateTl1Frames) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(3, 1, 2);
|
||||
CheckReferencesVp8(4, 2);
|
||||
CheckReferencesVp8(5, 3, 4);
|
||||
}
|
||||
|
||||
// Test with 1 temporal layer.
|
||||
@ -474,13 +476,13 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersReordering_0) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 1);
|
||||
CheckReferencesVp8(3, 2);
|
||||
CheckReferencesVp8(4, 3);
|
||||
CheckReferencesVp8(5, 4);
|
||||
CheckReferencesVp8(6, 5);
|
||||
}
|
||||
|
||||
// Test with 2 temporal layers in a 01 pattern.
|
||||
@ -494,10 +496,10 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayers_01) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(3, 1, 2);
|
||||
}
|
||||
|
||||
// Test with 2 temporal layers in a 01 pattern.
|
||||
@ -515,14 +517,14 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersReordering_01) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(3, 1, 2);
|
||||
CheckReferencesVp8(4, 2);
|
||||
CheckReferencesVp8(5, 3, 4);
|
||||
CheckReferencesVp8(6, 4);
|
||||
CheckReferencesVp8(7, 5, 6);
|
||||
}
|
||||
|
||||
// Test with 3 temporal layers in a 0212 pattern.
|
||||
@ -544,18 +546,18 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayers_0212) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(3, 0, 1, 2);
|
||||
CheckReferencesVp8(4, 0);
|
||||
CheckReferencesVp8(5, 2, 3, 4);
|
||||
CheckReferencesVp8(6, 2, 4);
|
||||
CheckReferencesVp8(7, 4, 5, 6);
|
||||
CheckReferencesVp8(8, 4);
|
||||
CheckReferencesVp8(9, 8);
|
||||
CheckReferencesVp8(10, 8);
|
||||
CheckReferencesVp8(11, 8, 9, 10);
|
||||
}
|
||||
|
||||
// Test with 3 temporal layers in a 0212 pattern.
|
||||
@ -568,8 +570,8 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersMissingFrame_0212) {
|
||||
InsertVp8(sn + 3, sn + 3, false, pid + 3, 2, 55, false);
|
||||
|
||||
ASSERT_EQ(2UL, frames_from_callback_.size());
|
||||
CheckReferencesVp8(pid);
|
||||
CheckReferencesVp8(pid + 2, pid);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
}
|
||||
|
||||
// Test with 3 temporal layers in a 0212 pattern.
|
||||
@ -591,18 +593,18 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8TemporalLayersReordering_0212) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(3, 0, 1, 2);
|
||||
CheckReferencesVp8(4, 0);
|
||||
CheckReferencesVp8(5, 2, 3, 4);
|
||||
CheckReferencesVp8(6, 2, 4);
|
||||
CheckReferencesVp8(7, 4, 5, 6);
|
||||
CheckReferencesVp8(8, 4);
|
||||
CheckReferencesVp8(9, 8);
|
||||
CheckReferencesVp8(10, 8);
|
||||
CheckReferencesVp8(11, 8, 9, 10);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp8InsertManyFrames_0212) {
|
||||
@ -611,6 +613,7 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8InsertManyFrames_0212) {
|
||||
|
||||
const int keyframes_to_insert = 50;
|
||||
const int frames_per_keyframe = 120; // Should be a multiple of 4.
|
||||
int64_t offset = 0;
|
||||
uint8_t tl0 = 128;
|
||||
|
||||
for (int k = 0; k < keyframes_to_insert; ++k) {
|
||||
@ -618,29 +621,31 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8InsertManyFrames_0212) {
|
||||
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);
|
||||
CheckReferencesVp8(offset);
|
||||
CheckReferencesVp8(offset + 1, offset);
|
||||
CheckReferencesVp8(offset + 2, offset);
|
||||
CheckReferencesVp8(offset + 3, offset, offset + 1, offset + 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;
|
||||
uint16_t pidf = pid + f;
|
||||
int64_t offsetf = offset + 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);
|
||||
CheckReferencesVp8(offsetf, offsetf - 4);
|
||||
CheckReferencesVp8(offsetf + 1, offsetf, offsetf - 1, offsetf - 2);
|
||||
CheckReferencesVp8(offsetf + 2, offsetf, offsetf - 2);
|
||||
CheckReferencesVp8(offsetf + 3, offsetf, offsetf + 1, offsetf + 2);
|
||||
frames_from_callback_.clear();
|
||||
++tl0;
|
||||
}
|
||||
|
||||
offset += frames_per_keyframe;
|
||||
pid += frames_per_keyframe;
|
||||
sn += frames_per_keyframe;
|
||||
}
|
||||
@ -661,13 +666,13 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8LayerSync) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(4, 2);
|
||||
CheckReferencesVp8(5, 4);
|
||||
CheckReferencesVp8(6, 4);
|
||||
CheckReferencesVp8(7, 6, 5);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp8Tl1SyncFrameAfterTl1Frame) {
|
||||
@ -677,9 +682,9 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8Tl1SyncFrameAfterTl1Frame) {
|
||||
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);
|
||||
CheckReferencesVp8(0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(4, 2);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp8DetectMissingFrame_0212) {
|
||||
@ -696,15 +701,15 @@ TEST_F(TestRtpFrameReferenceFinder, Vp8DetectMissingFrame_0212) {
|
||||
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(0);
|
||||
CheckReferencesVp8(1, 0);
|
||||
CheckReferencesVp8(2, 0);
|
||||
CheckReferencesVp8(3, 2, 1, 0);
|
||||
|
||||
CheckReferencesVp8(5, 1);
|
||||
CheckReferencesVp8(6, 5, 4, 3);
|
||||
CheckReferencesVp8(7, 5, 3);
|
||||
CheckReferencesVp8(8, 7, 6, 5);
|
||||
CheckReferencesVp8(4, 0);
|
||||
CheckReferencesVp8(5, 4, 3, 2);
|
||||
CheckReferencesVp8(6, 4, 2);
|
||||
CheckReferencesVp8(7, 6, 5, 4);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofInsertOneFrame) {
|
||||
@ -715,7 +720,7 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofInsertOneFrame) {
|
||||
|
||||
InsertVp9Gof(sn, sn, true, pid, 0, 0, 0, false, false, &ss);
|
||||
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9NoPictureIdReordered) {
|
||||
@ -733,16 +738,16 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9NoPictureIdReordered) {
|
||||
InsertVp9Gof(sn + 18, sn + 18, false);
|
||||
|
||||
ASSERT_EQ(10UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(sn + 2, 0);
|
||||
CheckReferencesVp9(sn + 4, 0, sn + 2);
|
||||
CheckReferencesVp9(sn + 8, 0, sn + 4);
|
||||
CheckReferencesVp9(sn + 9, 0, sn + 8);
|
||||
CheckReferencesVp9(sn + 11, 0, sn + 9);
|
||||
CheckReferencesVp9(sn + 12, 0);
|
||||
CheckReferencesVp9(sn + 17, 0, sn + 12);
|
||||
CheckReferencesVp9(sn + 18, 0, sn + 17);
|
||||
CheckReferencesVp9(sn + 20, 0, sn + 18);
|
||||
CheckReferencesVp9(sn + 21, 0, sn + 20);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(6, 0, 2);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(9, 0, 7);
|
||||
CheckReferencesVp9(10, 0);
|
||||
CheckReferencesVp9(15, 0, 10);
|
||||
CheckReferencesVp9(16, 0, 15);
|
||||
CheckReferencesVp9(18, 0, 16);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayers_0) {
|
||||
@ -773,26 +778,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayers_0) {
|
||||
InsertVp9Gof(sn + 19, sn + 19, false, pid + 19, 0, 0, 19, false);
|
||||
|
||||
ASSERT_EQ(20UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid + 1);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid + 3);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 5);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 7);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 9);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 11);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 13);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 16, 0, pid + 15);
|
||||
CheckReferencesVp9(pid + 17, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 18, 0, pid + 17);
|
||||
CheckReferencesVp9(pid + 19, 0, pid + 18);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 1);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 3);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 5);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 7);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 9);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
CheckReferencesVp9(12, 0, 11);
|
||||
CheckReferencesVp9(13, 0, 12);
|
||||
CheckReferencesVp9(14, 0, 13);
|
||||
CheckReferencesVp9(15, 0, 14);
|
||||
CheckReferencesVp9(16, 0, 15);
|
||||
CheckReferencesVp9(17, 0, 16);
|
||||
CheckReferencesVp9(18, 0, 17);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofSpatialLayers_2) {
|
||||
@ -809,11 +814,11 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofSpatialLayers_2) {
|
||||
InsertVp9Gof(sn + 4, sn + 4, false, pid + 2, 1, 0, 1, false, true);
|
||||
|
||||
ASSERT_EQ(5UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 1, 1);
|
||||
CheckReferencesVp9(pid + 2, 0, pid + 1);
|
||||
CheckReferencesVp9(pid + 2, 1, pid + 1);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(1, 1);
|
||||
CheckReferencesVp9(2, 0, 1);
|
||||
CheckReferencesVp9(2, 1, 1);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_0) {
|
||||
@ -844,26 +849,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_0) {
|
||||
InsertVp9Gof(sn + 18, sn + 18, false, pid + 18, 0, 0, 18, false);
|
||||
|
||||
ASSERT_EQ(20UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid + 1);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid + 3);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 5);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 7);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 9);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 11);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 13);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 16, 0, pid + 15);
|
||||
CheckReferencesVp9(pid + 17, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 18, 0, pid + 17);
|
||||
CheckReferencesVp9(pid + 19, 0, pid + 18);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 1);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 3);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 5);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 7);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 9);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
CheckReferencesVp9(12, 0, 11);
|
||||
CheckReferencesVp9(13, 0, 12);
|
||||
CheckReferencesVp9(14, 0, 13);
|
||||
CheckReferencesVp9(15, 0, 14);
|
||||
CheckReferencesVp9(16, 0, 15);
|
||||
CheckReferencesVp9(17, 0, 16);
|
||||
CheckReferencesVp9(18, 0, 17);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofSkipFramesTemporalLayers_01) {
|
||||
@ -883,12 +888,12 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofSkipFramesTemporalLayers_01) {
|
||||
InsertVp9Gof(sn + 11, sn + 11, false, pid + 11, 0, 1, 5, false);
|
||||
|
||||
ASSERT_EQ(6UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 4, 0);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(4, 0);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofSkipFramesTemporalLayers_0212) {
|
||||
@ -903,10 +908,10 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofSkipFramesTemporalLayers_0212) {
|
||||
InsertVp9Gof(sn + 3, sn + 3, false, pid + 3, 0, 2, 0, false);
|
||||
|
||||
ASSERT_EQ(4UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
|
||||
// Skip frames with tl0 = 1
|
||||
|
||||
@ -916,26 +921,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofSkipFramesTemporalLayers_0212) {
|
||||
InsertVp9Gof(sn + 11, sn + 11, false, pid + 11, 0, 2, 2, false);
|
||||
|
||||
ASSERT_EQ(8UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid + 8, 0);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(8, 0);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
|
||||
// Now insert frames with tl0 = 1
|
||||
InsertVp9Gof(sn + 4, sn + 4, true, pid + 4, 0, 0, 1, false, true, &ss);
|
||||
InsertVp9Gof(sn + 7, sn + 7, false, pid + 7, 0, 2, 1, false);
|
||||
|
||||
ASSERT_EQ(9UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid + 4, 0);
|
||||
CheckReferencesVp9(4, 0);
|
||||
|
||||
// Rest of frames belonging to tl0 = 1
|
||||
InsertVp9Gof(sn + 5, sn + 5, false, pid + 5, 0, 2, 1, false);
|
||||
InsertVp9Gof(sn + 6, sn + 6, false, pid + 6, 0, 1, 1, true); // up-switch
|
||||
|
||||
ASSERT_EQ(12UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayers_01) {
|
||||
@ -966,26 +971,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayers_01) {
|
||||
InsertVp9Gof(sn + 19, sn + 19, false, pid + 19, 0, 1, 9, false);
|
||||
|
||||
ASSERT_EQ(20UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 16, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 17, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 18, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 19, 0, pid + 18);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 2);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 6);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
CheckReferencesVp9(12, 0, 10);
|
||||
CheckReferencesVp9(13, 0, 12);
|
||||
CheckReferencesVp9(14, 0, 12);
|
||||
CheckReferencesVp9(15, 0, 14);
|
||||
CheckReferencesVp9(16, 0, 14);
|
||||
CheckReferencesVp9(17, 0, 16);
|
||||
CheckReferencesVp9(18, 0, 16);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_01) {
|
||||
@ -1016,26 +1021,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_01) {
|
||||
InsertVp9Gof(sn + 18, sn + 18, false, pid + 18, 0, 0, 9, false);
|
||||
|
||||
ASSERT_EQ(20UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 16, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 17, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 18, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 19, 0, pid + 18);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 2);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 6);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
CheckReferencesVp9(12, 0, 10);
|
||||
CheckReferencesVp9(13, 0, 12);
|
||||
CheckReferencesVp9(14, 0, 12);
|
||||
CheckReferencesVp9(15, 0, 14);
|
||||
CheckReferencesVp9(16, 0, 14);
|
||||
CheckReferencesVp9(17, 0, 16);
|
||||
CheckReferencesVp9(18, 0, 16);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayers_0212) {
|
||||
@ -1066,26 +1071,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayers_0212) {
|
||||
InsertVp9Gof(sn + 19, sn + 19, false, pid + 19, 0, 2, 4, false);
|
||||
|
||||
ASSERT_EQ(20UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 16, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 17, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 18, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 19, 0, pid + 18);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 0);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 4);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
CheckReferencesVp9(12, 0, 8);
|
||||
CheckReferencesVp9(13, 0, 12);
|
||||
CheckReferencesVp9(14, 0, 12);
|
||||
CheckReferencesVp9(15, 0, 14);
|
||||
CheckReferencesVp9(16, 0, 12);
|
||||
CheckReferencesVp9(17, 0, 16);
|
||||
CheckReferencesVp9(18, 0, 16);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_0212) {
|
||||
@ -1116,26 +1121,26 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_0212) {
|
||||
InsertVp9Gof(sn + 18, sn + 18, false, pid + 18, 0, 1, 4, false);
|
||||
|
||||
ASSERT_EQ(20UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 14);
|
||||
CheckReferencesVp9(pid + 16, 0, pid + 12);
|
||||
CheckReferencesVp9(pid + 17, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 18, 0, pid + 16);
|
||||
CheckReferencesVp9(pid + 19, 0, pid + 18);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 0);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 4);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
CheckReferencesVp9(12, 0, 8);
|
||||
CheckReferencesVp9(13, 0, 12);
|
||||
CheckReferencesVp9(14, 0, 12);
|
||||
CheckReferencesVp9(15, 0, 14);
|
||||
CheckReferencesVp9(16, 0, 12);
|
||||
CheckReferencesVp9(17, 0, 16);
|
||||
CheckReferencesVp9(18, 0, 16);
|
||||
CheckReferencesVp9(19, 0, 18);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersUpSwitch_02120212) {
|
||||
@ -1162,22 +1167,22 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersUpSwitch_02120212) {
|
||||
InsertVp9Gof(sn + 15, sn + 15, false, pid + 15, 0, 2, 3, false);
|
||||
|
||||
ASSERT_EQ(16UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 1, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 3, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 2, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 9, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 11, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 10, pid + 12);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 13, pid + 14);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 1, 2);
|
||||
CheckReferencesVp9(4, 0, 0);
|
||||
CheckReferencesVp9(5, 0, 3, 4);
|
||||
CheckReferencesVp9(6, 0, 2, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 4);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 9, 10);
|
||||
CheckReferencesVp9(12, 0, 8);
|
||||
CheckReferencesVp9(13, 0, 11, 12);
|
||||
CheckReferencesVp9(14, 0, 10, 12);
|
||||
CheckReferencesVp9(15, 0, 13, 14);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder,
|
||||
@ -1205,22 +1210,22 @@ TEST_F(TestRtpFrameReferenceFinder,
|
||||
InsertVp9Gof(sn + 14, sn + 14, false, pid + 14, 0, 1, 3, false);
|
||||
|
||||
ASSERT_EQ(16UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 1, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 3, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 2, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 9, pid + 10);
|
||||
CheckReferencesVp9(pid + 12, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 13, 0, pid + 11, pid + 12);
|
||||
CheckReferencesVp9(pid + 14, 0, pid + 10, pid + 12);
|
||||
CheckReferencesVp9(pid + 15, 0, pid + 13, pid + 14);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 1, 2);
|
||||
CheckReferencesVp9(4, 0, 0);
|
||||
CheckReferencesVp9(5, 0, 3, 4);
|
||||
CheckReferencesVp9(6, 0, 2, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 4);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 9, 10);
|
||||
CheckReferencesVp9(12, 0, 8);
|
||||
CheckReferencesVp9(13, 0, 11, 12);
|
||||
CheckReferencesVp9(14, 0, 10, 12);
|
||||
CheckReferencesVp9(15, 0, 13, 14);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_01_0212) {
|
||||
@ -1244,18 +1249,18 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTemporalLayersReordered_01_0212) {
|
||||
InsertVp9Gof(sn + 9, sn + 9, false, pid + 9, 0, 2, 3, false);
|
||||
|
||||
ASSERT_EQ(12UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 3, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid);
|
||||
CheckReferencesVp9(pid + 5, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 7, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 9, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 10, 0, pid + 8);
|
||||
CheckReferencesVp9(pid + 11, 0, pid + 10);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(3, 0, 2);
|
||||
CheckReferencesVp9(4, 0, 0);
|
||||
CheckReferencesVp9(5, 0, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(7, 0, 6);
|
||||
CheckReferencesVp9(8, 0, 4);
|
||||
CheckReferencesVp9(9, 0, 8);
|
||||
CheckReferencesVp9(10, 0, 8);
|
||||
CheckReferencesVp9(11, 0, 10);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeOneFrame) {
|
||||
@ -1265,7 +1270,7 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeOneFrame) {
|
||||
InsertVp9Flex(sn, sn, true, pid, 0, 0, false);
|
||||
|
||||
ASSERT_EQ(1UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeTwoSpatialLayers) {
|
||||
@ -1288,20 +1293,20 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeTwoSpatialLayers) {
|
||||
InsertVp9Flex(sn + 13, sn + 13, false, pid + 8, 1, 0, false, {1});
|
||||
|
||||
ASSERT_EQ(14UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid, 1);
|
||||
CheckReferencesVp9(pid + 1, 1, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 1, pid + 1);
|
||||
CheckReferencesVp9(pid + 3, 1, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 1, pid + 3);
|
||||
CheckReferencesVp9(pid + 5, 1, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 1, pid + 5);
|
||||
CheckReferencesVp9(pid + 7, 1, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 1, pid + 7);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(0, 1);
|
||||
CheckReferencesVp9(1, 1, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(2, 1, 1);
|
||||
CheckReferencesVp9(3, 1, 2);
|
||||
CheckReferencesVp9(4, 0, 2);
|
||||
CheckReferencesVp9(4, 1, 3);
|
||||
CheckReferencesVp9(5, 1, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(6, 1, 5);
|
||||
CheckReferencesVp9(7, 1, 6);
|
||||
CheckReferencesVp9(8, 0, 6);
|
||||
CheckReferencesVp9(8, 1, 7);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeTwoSpatialLayersReordered) {
|
||||
@ -1324,28 +1329,27 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9FlexibleModeTwoSpatialLayersReordered) {
|
||||
InsertVp9Flex(sn + 12, sn + 12, false, pid + 8, 0, 0, false, {2});
|
||||
|
||||
ASSERT_EQ(14UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid, 1);
|
||||
CheckReferencesVp9(pid + 1, 1, pid);
|
||||
CheckReferencesVp9(pid + 2, 0, pid);
|
||||
CheckReferencesVp9(pid + 2, 1, pid + 1);
|
||||
CheckReferencesVp9(pid + 3, 1, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 0, pid + 2);
|
||||
CheckReferencesVp9(pid + 4, 1, pid + 3);
|
||||
CheckReferencesVp9(pid + 5, 1, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 0, pid + 4);
|
||||
CheckReferencesVp9(pid + 6, 1, pid + 5);
|
||||
CheckReferencesVp9(pid + 7, 1, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 0, pid + 6);
|
||||
CheckReferencesVp9(pid + 8, 1, pid + 7);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(0, 1);
|
||||
CheckReferencesVp9(1, 1, 0);
|
||||
CheckReferencesVp9(2, 0, 0);
|
||||
CheckReferencesVp9(2, 1, 1);
|
||||
CheckReferencesVp9(3, 1, 2);
|
||||
CheckReferencesVp9(4, 0, 2);
|
||||
CheckReferencesVp9(4, 1, 3);
|
||||
CheckReferencesVp9(5, 1, 4);
|
||||
CheckReferencesVp9(6, 0, 4);
|
||||
CheckReferencesVp9(6, 1, 5);
|
||||
CheckReferencesVp9(7, 1, 6);
|
||||
CheckReferencesVp9(8, 0, 6);
|
||||
CheckReferencesVp9(8, 1, 7);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, WrappingFlexReference) {
|
||||
InsertVp9Flex(0, 0, false, 0, 0, 0, false, {1});
|
||||
|
||||
ASSERT_EQ(1UL, frames_from_callback_.size());
|
||||
const EncodedFrame& frame = *frames_from_callback_.begin()->second;
|
||||
ASSERT_EQ(frame.id.picture_id - frame.references[0], 1);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofPidJump) {
|
||||
@ -1364,7 +1368,7 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTl0Jump) {
|
||||
GofInfoVP9 ss;
|
||||
ss.SetGofInfoVP9(kTemporalStructureMode3);
|
||||
|
||||
InsertVp9Gof(sn, sn, true, pid, 0, 0, 125, true, false, &ss);
|
||||
InsertVp9Gof(sn, sn, true, pid + 0, 0, 0, 125, true, false, &ss);
|
||||
InsertVp9Gof(sn + 1, sn + 1, false, pid + 1, 0, 0, 0, false, true, &ss);
|
||||
}
|
||||
|
||||
@ -1381,7 +1385,7 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofTidTooHigh) {
|
||||
InsertVp9Gof(sn + 1, sn + 1, false, pid + 1, 0, 0, 1);
|
||||
|
||||
ASSERT_EQ(1UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(0, 0);
|
||||
}
|
||||
|
||||
TEST_F(TestRtpFrameReferenceFinder, Vp9GofZeroFrames) {
|
||||
@ -1394,8 +1398,8 @@ TEST_F(TestRtpFrameReferenceFinder, Vp9GofZeroFrames) {
|
||||
InsertVp9Gof(sn + 1, sn + 1, false, pid + 1, 0, 0, 1);
|
||||
|
||||
ASSERT_EQ(2UL, frames_from_callback_.size());
|
||||
CheckReferencesVp9(pid, 0);
|
||||
CheckReferencesVp9(pid + 1, 0, pid);
|
||||
CheckReferencesVp9(0, 0);
|
||||
CheckReferencesVp9(1, 0, 0);
|
||||
}
|
||||
|
||||
} // namespace video_coding
|
||||
|
||||
Reference in New Issue
Block a user