diff options
| author | jbauch <jbauch@webrtc.org> | 2015-11-23 03:59:02 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-23 11:59:07 +0000 |
| commit | db81ffd6f50d487441555947ec63ccc766e75043 (patch) | |
| tree | d2b0817e1ee5a432e9faf0a2a8efb1656fe16438 /webrtc/modules/video_coding/jitter_buffer_unittest.cc | |
| parent | fa8ae9a5356de3cb4fd820cc97d251c9a2ce000a (diff) | |
| download | webrtc-db81ffd6f50d487441555947ec63ccc766e75043.tar.gz | |
Request keyframe if too many packets are missing and NACK is disabled.
This allows enabling "EndToEndTest.ReceivesPliAndRecoversWithoutNack".
BUG=webrtc:2250
Review URL: https://codereview.webrtc.org/1211873004
Cr-Commit-Position: refs/heads/master@{#10747}
Diffstat (limited to 'webrtc/modules/video_coding/jitter_buffer_unittest.cc')
| -rw-r--r-- | webrtc/modules/video_coding/jitter_buffer_unittest.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webrtc/modules/video_coding/jitter_buffer_unittest.cc b/webrtc/modules/video_coding/jitter_buffer_unittest.cc index 52151ea9aa..116bf088c1 100644 --- a/webrtc/modules/video_coding/jitter_buffer_unittest.cc +++ b/webrtc/modules/video_coding/jitter_buffer_unittest.cc @@ -1834,6 +1834,12 @@ TEST_F(TestBasicJitterBuffer, ExceedNumOfFrameWithSeqNumWrap) { // -------------------------------------------------------------- // |<-----------delta frames------------->|<------key frames----->| + // Make sure the jitter doesn't request a keyframe after too much non- + // decodable frames. + jitter_buffer_->SetNackMode(kNack, -1, -1); + jitter_buffer_->SetNackSettings(kMaxNumberOfFrames, + kMaxNumberOfFrames, 0); + int loop = 0; seq_num_ = 65485; uint32_t first_key_frame_timestamp = 0; @@ -2131,6 +2137,11 @@ TEST_F(TestBasicJitterBuffer, NextFrameWhenIncomplete) { } TEST_F(TestRunningJitterBuffer, Full) { + // Make sure the jitter doesn't request a keyframe after too much non- + // decodable frames. + jitter_buffer_->SetNackMode(kNack, -1, -1); + jitter_buffer_->SetNackSettings(kMaxNumberOfFrames, + kMaxNumberOfFrames, 0); // Insert a key frame and decode it. EXPECT_GE(InsertFrame(kVideoFrameKey), kNoError); EXPECT_TRUE(DecodeCompleteFrame()); |