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

jitter_buffer updates:

Browse Source 
1. Determining continuity based on pictureId and not seq. numbers when available.
2. Hybrid bug fix: Don't set to decodable when the nack list is empty.
Review URL: http://webrtc-codereview.appspot.com/255001

git-svn-id: http://webrtc.googlecode.com/svn/trunk@878 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org
2011-11-03 00:42:52 +00:00
parent 7232ad78b2
commit e203de7ba2
2 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/modules/video_coding/main/source/jitter_buffer.cc
View File

@@ -614,26 +614,33 @@ VCMJitterBuffer::FindOldestCompleteContinuousFrame()
// we have a complete frame // we have a complete frame
// check if it's continuous, otherwise we are missing a full frame // check if it's continuous, otherwise we are missing a full frame
// Use seqNum not timestamp since a full frame might be lost
if (_lastDecodedSeqNum != -1 && !_waitingForKeyFrame)
{
// it's not enough that we have complete frame we need the layers to
// be continuous too
currentLow = oldestFrame->GetLowSeqNum();
WebRtc_UWord16 lastDecodedSeqNum = (WebRtc_UWord16)_lastDecodedSeqNum; // Use pictureId if available. Otherwise use seqNum and not timestamps, as
// a complete frame might be lost
// We could have received the first packet of the last frame before a // First determine if we are waiting for a key frame.
// long period if drop, that case is handled by GetNackList if (_waitingForKeyFrame && oldestFrame->FrameType() != kVideoFrameKey) {
if (((WebRtc_UWord16)(lastDecodedSeqNum + 1)) != currentLow) return NULL;
{
// Wait since we want a complete continuous frame
return NULL;
}
} }
else if (oldestFrame->FrameType() != kVideoFrameKey) // Is this the first frame to be decoded?
{ // Otherwise, verify continuity - use PictureId when available.
if (_lastDecodedSeqNum == -1) {
return oldestFrameItem;
} else if (oldestFrame->PictureId() == kNoPictureId) {
// It's not enough that we have a complete frame we need the layers to
// be continuous too.
currentLow = oldestFrame->GetLowSeqNum();
WebRtc_UWord16 lastDecodedSeqNum = (WebRtc_UWord16)_lastDecodedSeqNum;
// We could have received the first packet of the last frame before a
// long period if drop, that case is handled by GetNackList
if (((WebRtc_UWord16)(lastDecodedSeqNum + 1)) != currentLow) {
// Wait since we want a complete continuous frame
return NULL; return NULL;
}
}
else if (!ContinuousPictureId(oldestFrame->PictureId())) {
// We don't have a continuous frame
return NULL;
} }
return oldestFrameItem; return oldestFrameItem;
} }
@@ -1460,10 +1467,11 @@ VCMJitterBuffer::CreateNackList(WebRtc_UWord16& nackSize, bool& listExtended)
{ {
// build external rttScore based on RTT value // build external rttScore based on RTT value
float rttScore = 1.0f; float rttScore = 1.0f;
int ret =
_frameBuffers[i]->ZeroOutSeqNumHybrid(_NACKSeqNumInternal, _frameBuffers[i]->ZeroOutSeqNumHybrid(_NACKSeqNumInternal,
numberOfSeqNum, numberOfSeqNum,
rttScore); rttScore);
if (_frameBuffers[i]->IsRetransmitted() == false) if (_frameBuffers[i]->IsRetransmitted() == false && ret != -1)
{ {
// If no retransmission required,set the state to decodable // If no retransmission required,set the state to decodable
// meaning that we will not wait for NACK. // meaning that we will not wait for NACK.

9
src/modules/video_coding/main/source/session_info.cc
View File

@@ -491,7 +491,7 @@ WebRtc_Word32
VCMSessionInfo::ZeroOutSeqNum(WebRtc_Word32* list, VCMSessionInfo::ZeroOutSeqNum(WebRtc_Word32* list,
WebRtc_Word32 numberOfSeqNum) WebRtc_Word32 numberOfSeqNum)
{ {
if ((NULL == list) || (numberOfSeqNum < 1)) if (NULL == list || numberOfSeqNum < 1)
{ {
return -1; return -1;
} }
@@ -539,15 +539,10 @@ VCMSessionInfo::ZeroOutSeqNumHybrid(WebRtc_Word32* list,
WebRtc_Word32 numberOfSeqNum, WebRtc_Word32 numberOfSeqNum,
float rttScore) float rttScore)
{ {
if ((NULL == list) || (numberOfSeqNum < 1)) if (NULL == list || numberOfSeqNum < 1)
{ {
return -1; return -1;
} }
if (_lowSeqNum == -1)
{
// no media packets in this frame
return 0;
}
WebRtc_Word32 index = 0; WebRtc_Word32 index = 0;
// Find end point (index of entry that equals _lowSeqNum) // Find end point (index of entry that equals _lowSeqNum)