Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(19)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc

Issue 1386903002: Add support for handling reordered SS data on the receive-side for VP9. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« webrtc/modules/video_coding/main/source/jitter_buffer.cc ('K') | « webrtc/modules/video_coding/main/source/jitter_buffer.cc ('k') | webrtc/modules/video_coding/main/source/session_info.h » ('j') | webrtc/modules/video_coding/main/source/session_info.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
index 7ba4d68b5cee71d6f1043d7277de8548baa43c6f..9eb0de74e6df23126a6f54061298ae457f217058 100644
--- a/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
+++ b/webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
@@ -25,6 +25,179 @@
namespace webrtc {
+namespace {
+ const uint32_t kProcessIntervalSec = 60;
+} // namespace
+
+class Vp9SsMapTest : public ::testing::Test {
+ protected:
+ virtual void SetUp() {
+ uint16_t seq_num = 1234;
+ uint32_t timestamp = 1;
+ int length = 1400;
+ packet_.reset(new VCMPacket(data_, length, seq_num, timestamp, true));
+ packet_->isFirstPacket = true;
+ packet_->markerBit = true;
+ packet_->frameType = kVideoFrameKey;
+ packet_->codec = kVideoCodecVP9;
+ packet_->codecSpecificHeader.codec = kRtpVideoVp9;
+ packet_->codecSpecificHeader.codecHeader.VP9.flexible_mode = false;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 0;
+ packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx = kNoTemporalIdx;
+ packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch = false;
+ packet_->codecSpecificHeader.codecHeader.VP9.ss_data_available = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof.SetGofInfoVP9(
+ kTemporalStructureMode3); // kTemporalStructureMode3: 0-2-1-2..
+ }
+
+ Vp9SsMap map_;
+ uint8_t data_[1500];
+ rtc::scoped_ptr<VCMPacket> packet_;
+};
+
+TEST_F(Vp9SsMapTest, Insert) {
+ EXPECT_TRUE(map_.Insert(*packet_));
+}
+
+TEST_F(Vp9SsMapTest, Insert_NoSsData) {
+ packet_->codecSpecificHeader.codecHeader.VP9.ss_data_available = false;
+ EXPECT_FALSE(map_.Insert(*packet_));
+}
+
+TEST_F(Vp9SsMapTest, Find) {
+ EXPECT_TRUE(map_.Insert(*packet_));
+ uint32_t timestamp;
+ EXPECT_TRUE(map_.Find(packet_->timestamp, &timestamp));
+ EXPECT_EQ(packet_->timestamp, timestamp);
+}
+
+TEST_F(Vp9SsMapTest, Find_WithWrap) {
+ const uint32_t kSsTimestamp1 = 0xFFFFFFFF;
+ const uint32_t kSsTimestamp2 = 100;
+ packet_->timestamp = kSsTimestamp1;
+ EXPECT_TRUE(map_.Insert(*packet_));
+ packet_->timestamp = kSsTimestamp2;
+ EXPECT_TRUE(map_.Insert(*packet_));
+ uint32_t timestamp;
+ EXPECT_FALSE(map_.Find(kSsTimestamp1 - 1, &timestamp));
+ EXPECT_TRUE(map_.Find(kSsTimestamp1, &timestamp));
+ EXPECT_EQ(kSsTimestamp1, timestamp);
+ EXPECT_TRUE(map_.Find(kSsTimestamp1 + 1, &timestamp));
+ EXPECT_EQ(kSsTimestamp1, timestamp);
+ EXPECT_TRUE(map_.Find(kSsTimestamp2 - 1, &timestamp));
+ EXPECT_EQ(kSsTimestamp1, timestamp);
+ EXPECT_TRUE(map_.Find(kSsTimestamp2, &timestamp));
+ EXPECT_EQ(kSsTimestamp2, timestamp);
+ EXPECT_TRUE(map_.Find(kSsTimestamp2 + 1, &timestamp));
+ EXPECT_EQ(kSsTimestamp2, timestamp);
+}
+
+TEST_F(Vp9SsMapTest, Reset) {
+ EXPECT_TRUE(map_.Insert(*packet_));
+ uint32_t timestamp;
+ EXPECT_TRUE(map_.Find(packet_->timestamp, &timestamp));
+ EXPECT_EQ(packet_->timestamp, timestamp);
+
+ map_.Reset();
+ EXPECT_FALSE(map_.Find(packet_->timestamp, &timestamp));
+}
+
+TEST_F(Vp9SsMapTest, RemoveOld) {
+ const uint32_t kSsTimestamp1 = 10000;
+ const uint32_t kSsTimestamp2 = 20000;
+ const uint32_t kSsTimestamp3 = 30000;
+ packet_->timestamp = kSsTimestamp1;
+ EXPECT_TRUE(map_.Insert(*packet_));
+ packet_->timestamp = kSsTimestamp2;
+ EXPECT_TRUE(map_.Insert(*packet_));
+ packet_->timestamp = kSsTimestamp3;
+ EXPECT_TRUE(map_.Insert(*packet_));
+
+ const uint32_t kTimestamp = kSsTimestamp1 + (kProcessIntervalSec) * 90000;
+ map_.RemoveOld(kTimestamp);
+ uint32_t timestamp;
+ EXPECT_FALSE(map_.Find(kSsTimestamp1, &timestamp));
+ EXPECT_FALSE(map_.Find(kSsTimestamp2, &timestamp));
+ EXPECT_FALSE(map_.Find(kSsTimestamp3, &timestamp));
+ EXPECT_TRUE(map_.Find(kTimestamp, &timestamp));
+ EXPECT_EQ(kTimestamp, timestamp);
+}
+
+TEST_F(Vp9SsMapTest, RemoveOld_WithWrap) {
+ uint32_t timestamp;
+ const uint32_t kSsTimestamp1 = 0xFFFFFFFF;
+ map_.RemoveOld(kSsTimestamp1); // No SS data, should have no effect.
+
+ packet_->timestamp = kSsTimestamp1;
+ EXPECT_TRUE(map_.Insert(*packet_));
+
+ map_.RemoveOld(kSsTimestamp1 - 1);
+ EXPECT_TRUE(map_.Find(kSsTimestamp1, &timestamp));
+ map_.RemoveOld(kSsTimestamp1);
+ EXPECT_TRUE(map_.Find(kSsTimestamp1, &timestamp));
+
+ const uint32_t kSsTimestamp2 = kSsTimestamp1 + kProcessIntervalSec * 90000;
+ packet_->timestamp = kSsTimestamp2;
+ EXPECT_TRUE(map_.Insert(*packet_));
+
+ map_.RemoveOld(kSsTimestamp1);
+ EXPECT_TRUE(map_.Find(kSsTimestamp1, &timestamp));
+ EXPECT_TRUE(map_.Find(kSsTimestamp2, &timestamp));
+ map_.RemoveOld(kSsTimestamp2);
+ EXPECT_FALSE(map_.Find(kSsTimestamp1, &timestamp));
+ EXPECT_TRUE(map_.Find(kSsTimestamp2, &timestamp));
+}
+
+TEST_F(Vp9SsMapTest, UpdatePacket_NoSsData) {
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 0;
+ EXPECT_FALSE(map_.UpdatePacket(packet_.get()));
+}
+
+TEST_F(Vp9SsMapTest, UpdatePacket_NoGofIdx) {
+ EXPECT_TRUE(map_.Insert(*packet_));
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = kNoGofIdx;
+ EXPECT_FALSE(map_.UpdatePacket(packet_.get()));
+}
+
+TEST_F(Vp9SsMapTest, UpdatePacket_InvalidGofIdx) {
+ EXPECT_TRUE(map_.Insert(*packet_));
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 4;
+ EXPECT_FALSE(map_.UpdatePacket(packet_.get()));
+}
+
+TEST_F(Vp9SsMapTest, UpdatePacket) {
+ EXPECT_TRUE(map_.Insert(*packet_)); // kTemporalStructureMode3: 0-2-1-2..
+
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 0;
+ EXPECT_TRUE(map_.UpdatePacket(packet_.get()));
+ EXPECT_EQ(0, packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx);
+ EXPECT_FALSE(packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch);
+ EXPECT_EQ(1U, packet_->codecSpecificHeader.codecHeader.VP9.num_ref_pics);
+ EXPECT_EQ(4, packet_->codecSpecificHeader.codecHeader.VP9.pid_diff[0]);
+
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 1;
+ EXPECT_TRUE(map_.UpdatePacket(packet_.get()));
+ EXPECT_EQ(2, packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx);
+ EXPECT_TRUE(packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch);
+ EXPECT_EQ(1U, packet_->codecSpecificHeader.codecHeader.VP9.num_ref_pics);
+ EXPECT_EQ(1, packet_->codecSpecificHeader.codecHeader.VP9.pid_diff[0]);
+
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 2;
+ EXPECT_TRUE(map_.UpdatePacket(packet_.get()));
+ EXPECT_EQ(1, packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx);
+ EXPECT_TRUE(packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch);
+ EXPECT_EQ(1U, packet_->codecSpecificHeader.codecHeader.VP9.num_ref_pics);
+ EXPECT_EQ(2, packet_->codecSpecificHeader.codecHeader.VP9.pid_diff[0]);
+
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 3;
+ EXPECT_TRUE(map_.UpdatePacket(packet_.get()));
+ EXPECT_EQ(2, packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx);
+ EXPECT_FALSE(packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch);
+ EXPECT_EQ(2U, packet_->codecSpecificHeader.codecHeader.VP9.num_ref_pics);
+ EXPECT_EQ(1, packet_->codecSpecificHeader.codecHeader.VP9.pid_diff[0]);
+ EXPECT_EQ(2, packet_->codecSpecificHeader.codecHeader.VP9.pid_diff[1]);
+}
+
class TestBasicJitterBuffer : public ::testing::Test {
protected:
virtual void SetUp() {
@@ -707,6 +880,135 @@ TEST_F(TestBasicJitterBuffer, DuplicatePreviousDeltaFramePacket) {
}
}
+TEST_F(TestBasicJitterBuffer, TestSkipForwardVp9) {
+ // Verify that JB skips forward to next base layer frame.
+ // -------------------------------------------------
+ // | 65485 | 65486 | 65487 | 65488 | 65489 | ...
+ // | pid:5 | pid:6 | pid:7 | pid:8 | pid:9 | ...
+ // | tid:0 | tid:2 | tid:1 | tid:2 | tid:0 | ...
+ // | ss | x | x | x | |
+ // -------------------------------------------------
+ // |<----------tl0idx:200--------->|<---tl0idx:201---
+
+ bool re = false;
+ packet_->codec = kVideoCodecVP9;
+ packet_->codecSpecificHeader.codec = kRtpVideoVp9;
+ packet_->isFirstPacket = true;
+ packet_->markerBit = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.flexible_mode = false;
+ packet_->codecSpecificHeader.codecHeader.VP9.spatial_idx = 0;
+ packet_->codecSpecificHeader.codecHeader.VP9.beginning_of_frame = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.end_of_frame = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx = kNoTemporalIdx;
+ packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch = false;
+
+ packet_->seqNum = 65485;
+ packet_->timestamp = 1000;
+ packet_->frameType = kVideoFrameKey;
+ packet_->codecSpecificHeader.codecHeader.VP9.picture_id = 5;
+ packet_->codecSpecificHeader.codecHeader.VP9.tl0_pic_idx = 200;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 0;
+ packet_->codecSpecificHeader.codecHeader.VP9.ss_data_available = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof.SetGofInfoVP9(
+ kTemporalStructureMode3); // kTemporalStructureMode3: 0-2-1-2..
+ EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_, &re));
+
+ // Insert next temporal layer 0.
+ packet_->seqNum = 65489;
+ packet_->timestamp = 13000;
+ packet_->frameType = kVideoFrameDelta;
+ packet_->codecSpecificHeader.codecHeader.VP9.picture_id = 9;
+ packet_->codecSpecificHeader.codecHeader.VP9.tl0_pic_idx = 201;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 0;
+ packet_->codecSpecificHeader.codecHeader.VP9.ss_data_available = false;
+ EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_, &re));
+
+ VCMEncodedFrame* frame_out = DecodeCompleteFrame();
+ EXPECT_EQ(1000U, frame_out->TimeStamp());
+ EXPECT_EQ(kVideoFrameKey, frame_out->FrameType());
+ jitter_buffer_->ReleaseFrame(frame_out);
+
+ frame_out = DecodeCompleteFrame();
+ EXPECT_EQ(13000U, frame_out->TimeStamp());
+ EXPECT_EQ(kVideoFrameDelta, frame_out->FrameType());
+ jitter_buffer_->ReleaseFrame(frame_out);
+}
+
+TEST_F(TestBasicJitterBuffer, ReorderedVp9SsData) {
+ // Verify that frames are updated with SS data when SS packet is reordered.
+ // --------------------------------
+ // | 65486 | 65487 | 65485 |...
+ // | pid:6 | pid:7 | pid:5 |...
+ // | tid:2 | tid:1 | tid:0 |...
+ // | | | ss |
+ // --------------------------------
+ // |<--------tl0idx:200--------->|
+
+ bool re = false;
+ packet_->codec = kVideoCodecVP9;
+ packet_->codecSpecificHeader.codec = kRtpVideoVp9;
+ packet_->isFirstPacket = true;
+ packet_->markerBit = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.flexible_mode = false;
+ packet_->codecSpecificHeader.codecHeader.VP9.spatial_idx = 0;
+ packet_->codecSpecificHeader.codecHeader.VP9.beginning_of_frame = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.end_of_frame = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.temporal_idx = kNoTemporalIdx;
+ packet_->codecSpecificHeader.codecHeader.VP9.temporal_up_switch = false;
+ packet_->codecSpecificHeader.codecHeader.VP9.tl0_pic_idx = 200;
+
+ packet_->seqNum = 65486;
+ packet_->timestamp = 6000;
+ packet_->frameType = kVideoFrameDelta;
+ packet_->codecSpecificHeader.codecHeader.VP9.picture_id = 6;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 1;
+ EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_, &re));
+
+ packet_->seqNum = 65487;
+ packet_->timestamp = 9000;
+ packet_->frameType = kVideoFrameDelta;
+ packet_->codecSpecificHeader.codecHeader.VP9.picture_id = 7;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 2;
+ EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_, &re));
+
+ // Insert first frame with SS data.
+ packet_->seqNum = 65485;
+ packet_->timestamp = 3000;
+ packet_->frameType = kVideoFrameKey;
+ packet_->width = 352;
+ packet_->height = 288;
+ packet_->codecSpecificHeader.codecHeader.VP9.picture_id = 5;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof_idx = 0;
+ packet_->codecSpecificHeader.codecHeader.VP9.ss_data_available = true;
+ packet_->codecSpecificHeader.codecHeader.VP9.gof.SetGofInfoVP9(
+ kTemporalStructureMode3); // kTemporalStructureMode3: 0-2-1-2..
+ EXPECT_EQ(kCompleteSession, jitter_buffer_->InsertPacket(*packet_, &re));
+
+ VCMEncodedFrame* frame_out = DecodeCompleteFrame();
+ EXPECT_EQ(3000U, frame_out->TimeStamp());
+ EXPECT_EQ(kVideoFrameKey, frame_out->FrameType());
+ EXPECT_EQ(0, frame_out->CodecSpecific()->codecSpecific.VP9.temporal_idx);
+ EXPECT_FALSE(
+ frame_out->CodecSpecific()->codecSpecific.VP9.temporal_up_switch);
+ EXPECT_EQ(1U, packet_->codecSpecificHeader.codecHeader.VP9.num_ref_pics);
+ EXPECT_EQ(4, packet_->codecSpecificHeader.codecHeader.VP9.pid_diff[0]);
+ jitter_buffer_->ReleaseFrame(frame_out);
+
+ frame_out = DecodeCompleteFrame();
+ EXPECT_EQ(6000U, frame_out->TimeStamp());
+ EXPECT_EQ(kVideoFrameDelta, frame_out->FrameType());
+ EXPECT_EQ(2, frame_out->CodecSpecific()->codecSpecific.VP9.temporal_idx);
+ EXPECT_TRUE(frame_out->CodecSpecific()->codecSpecific.VP9.temporal_up_switch);
+ jitter_buffer_->ReleaseFrame(frame_out);
+
+ frame_out = DecodeCompleteFrame();
+ EXPECT_EQ(9000U, frame_out->TimeStamp());
+ EXPECT_EQ(kVideoFrameDelta, frame_out->FrameType());
+ EXPECT_EQ(1, frame_out->CodecSpecific()->codecSpecific.VP9.temporal_idx);
+ EXPECT_TRUE(frame_out->CodecSpecific()->codecSpecific.VP9.temporal_up_switch);
+ jitter_buffer_->ReleaseFrame(frame_out);
+}
+
TEST_F(TestBasicJitterBuffer, H264InsertStartCode) {
packet_->frameType = kVideoFrameKey;
packet_->isFirstPacket = true;
« webrtc/modules/video_coding/main/source/jitter_buffer.cc ('K') | « webrtc/modules/video_coding/main/source/jitter_buffer.cc ('k') | webrtc/modules/video_coding/main/source/session_info.h » ('j') | webrtc/modules/video_coding/main/source/session_info.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698