Fixed r5373-related regressions in VideoFramesQueue::FrameToRecord()
R=henrike@webrtc.org, stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20389004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6018 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
parent
0300939484
commit
ceffdbc371
1
AUTHORS
1
AUTHORS
@ -9,6 +9,7 @@ Jie Mao <maojie0924@gmail.com>
|
||||
Luke Weber
|
||||
Martin Storsjo <martin@martin.st>
|
||||
Pali Rohar
|
||||
Paul Kapustin <pkapustin@gmail.com>
|
||||
Rafael Lopez Diez <rafalopezdiez@gmail.com>
|
||||
Robert Nagy
|
||||
Silviu Caragea <silviu.cpp@gmail.com>
|
||||
|
@ -80,8 +80,10 @@ I420VideoFrame* VideoFramesQueue::FrameToRecord() {
|
||||
// List is traversed beginning to end. If ptrRenderFrame is not
|
||||
// NULL it must be the first, and thus oldest, VideoFrame in the
|
||||
// queue. It can be recycled.
|
||||
ReturnFrame(ptrRenderFrame);
|
||||
iter = _incomingFrames.erase(iter);
|
||||
if (ptrRenderFrame) {
|
||||
ReturnFrame(ptrRenderFrame);
|
||||
_incomingFrames.pop_front();
|
||||
}
|
||||
ptrRenderFrame = ptrOldestFrameInList;
|
||||
} else {
|
||||
// All VideoFrames following this one will be even newer. No match
|
||||
|
Loading…
Reference in New Issue
Block a user