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

Fix potential issue where frame buffers might be freed while being decoded.

Browse Source 
BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/243004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@791 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
stefan@webrtc.org
2011-10-21 06:46:37 +00:00
parent 2b0f094c8f
commit ead87b5051
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -288,7 +288,7 @@ VCMJitterBuffer::FlushInternal()
void void
VCMJitterBuffer::ReleaseFrameInternal(VCMFrameBuffer* frame) VCMJitterBuffer::ReleaseFrameInternal(VCMFrameBuffer* frame)
{ {
if (frame != NULL) if (frame != NULL && frame->GetState() != kStateDecoding)
{ {
frame->SetState(kStateFree); frame->SetState(kStateFree);
} }
@@ -1532,12 +1532,15 @@ VCMJitterBuffer::CreateNackList(WebRtc_UWord16& nackSize, bool& listExtended)
return _NACKSeqNum; return _NACKSeqNum;
} }
// Release frame (when done with decoding), forwards to internal function // Release frame when done with decoding. Should never be used to release
// frames from within the jitter buffer.
void void
VCMJitterBuffer::ReleaseFrame(VCMEncodedFrame* frame) VCMJitterBuffer::ReleaseFrame(VCMEncodedFrame* frame)
{ {
CriticalSectionScoped cs(_critSect); CriticalSectionScoped cs(_critSect);
ReleaseFrameInternal(static_cast<VCMFrameBuffer*>(frame)); VCMFrameBuffer* frameBuffer = static_cast<VCMFrameBuffer*>(frame);
if (frameBuffer != NULL)
frameBuffer->SetState(kStateFree);
} }
WebRtc_Word64 WebRtc_Word64
@@ -1852,8 +1855,7 @@ VCMJitterBuffer::CleanUpSizeZeroFrames()
VCMFrameBuffer* ptrTempBuffer = frameListItem->GetItem(); VCMFrameBuffer* ptrTempBuffer = frameListItem->GetItem();
// pop frame if its size zero but store seqnum // pop frame if its size zero but store seqnum
if (ptrTempBuffer->Length() == 0 && if (ptrTempBuffer->Length() == 0)
ptrTempBuffer->GetState() != kStateDecoding)
{ {
WebRtc_Word32 frameHighSeqNum = ptrTempBuffer->GetHighSeqNum(); WebRtc_Word32 frameHighSeqNum = ptrTempBuffer->GetHighSeqNum();
if (frameHighSeqNum == -1) if (frameHighSeqNum == -1)