generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Start NACKing as soon as we have the first packet of a key frame.

Browse Source 
BUG=1605

Review URL: https://webrtc-codereview.appspot.com/1307007

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3855 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org 2013-04-16 09:38:26 +00:00
parent bdb9b971be
commit 885cd13356
6 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
webrtc/modules/video_coding/main/source/frame_buffer.cc
View File

@ -216,6 +216,12 @@ VCMFrameBuffer::GetNackCount() const
return _nackCount;
}
bool
VCMFrameBuffer::HaveFirstPacket() const
{
return _sessionInfo.HaveFirstPacket();
}
bool
VCMFrameBuffer::HaveLastPacket() const
{

1
webrtc/modules/video_coding/main/source/frame_buffer.h
View File

@ -44,6 +44,7 @@ public:
bool IsRetransmitted() const;
bool IsSessionComplete() const;
bool HaveFirstPacket() const;
bool HaveLastPacket() const;
// Makes sure the session contain a decodable stream.
void MakeSessionDecodable();

18
webrtc/modules/video_coding/main/source/jitter_buffer.cc
View File

@ -878,11 +878,19 @@ uint16_t* VCMJitterBuffer::GetNackList(uint16_t* nack_list_size,
return NULL;
}
if (last_decoded_state_.in_initial_state()) {
const bool have_non_empty_frame = frame_list_.end() != find_if(
frame_list_.begin(), frame_list_.end(), HasNonEmptyState);
*request_key_frame = have_non_empty_frame;
*nack_list_size = 0;
return NULL;
bool first_frame_is_key = !frame_list_.empty() &&
frame_list_.front()->FrameType() == kVideoFrameKey &&
frame_list_.front()->HaveFirstPacket();
if (!first_frame_is_key) {
const bool have_non_empty_frame = frame_list_.end() != find_if(
frame_list_.begin(), frame_list_.end(), HasNonEmptyState);
bool found_key_frame = RecycleFramesUntilKeyFrame();
if (!found_key_frame) {
*request_key_frame = have_non_empty_frame;
*nack_list_size = 0;
return NULL;
}
}
}
if (TooLargeNackList()) {
TRACE_EVENT_INSTANT1("webrtc", "JB::NackListTooLarge",

18
webrtc/modules/video_coding/main/source/jitter_buffer_unittest.cc
View File

@ -494,6 +494,24 @@ TEST_F(TestJitterBufferNack, NackListBuiltBeforeFirstDecode) {
EXPECT_TRUE(list != NULL);
}
TEST_F(TestJitterBufferNack, UseNackToRecoverFirstKeyFrame) {
stream_generator->Init(0, 0, clock_->TimeInMilliseconds());
stream_generator->GenerateFrame(kVideoFrameKey, 3, 0,
clock_->TimeInMilliseconds());
EXPECT_EQ(kFirstPacket, InsertPacketAndPop(0));
// Drop second packet.
EXPECT_EQ(kIncomplete, InsertPacketAndPop(1));
EXPECT_FALSE(DecodeCompleteFrame());
uint16_t nack_list_size = 0;
bool extended = false;
uint16_t* list = jitter_buffer_->GetNackList(&nack_list_size, &extended);
EXPECT_EQ(1, nack_list_size);
ASSERT_TRUE(list != NULL);
VCMPacket packet;
stream_generator->GetPacket(&packet, 0);
EXPECT_EQ(packet.seqNum, list[0]);
}
TEST_F(TestJitterBufferNack, NormalOperation) {
EXPECT_EQ(kNack, jitter_buffer_->nack_mode());

5
webrtc/modules/video_coding/main/source/session_info.cc
View File

@ -353,6 +353,11 @@ int VCMSessionInfo::MakeDecodable() {
return return_length;
}
bool
VCMSessionInfo::HaveFirstPacket() const {
return !packets_.empty() && packets_.front().isFirstPacket;
}
bool
VCMSessionInfo::HaveLastPacket() const {
return (!packets_.empty() && packets_.back().markerBit);

1
webrtc/modules/video_coding/main/source/session_info.h
View File

@ -59,6 +59,7 @@ class VCMSessionInfo {
// Returns the number of bytes deleted from the session.
int MakeDecodable();
int SessionLength() const;
bool HaveFirstPacket() const;
bool HaveLastPacket() const;
bool session_nack() const;
webrtc::FrameType FrameType() const { return frame_type_; }