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

Fixed r5373-related regressions in VideoFramesQueue::FrameToRecord()

Browse Source 
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:
henrike@webrtc.org 2014-04-29 17:11:07 +00:00
parent 0300939484
commit ceffdbc371
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -9,6 +9,7 @@ Jie Mao <maojie0924@gmail.com>
Luke Weber Luke Weber
Martin Storsjo <martin@martin.st> Martin Storsjo <martin@martin.st>
Pali Rohar Pali Rohar
Paul Kapustin <pkapustin@gmail.com>
Rafael Lopez Diez <rafalopezdiez@gmail.com> Rafael Lopez Diez <rafalopezdiez@gmail.com>
Robert Nagy Robert Nagy
Silviu Caragea <silviu.cpp@gmail.com> Silviu Caragea <silviu.cpp@gmail.com>

4
webrtc/modules/utility/source/video_frames_queue.cc
View File

@ -80,8 +80,10 @@ I420VideoFrame* VideoFramesQueue::FrameToRecord() {
// List is traversed beginning to end. If ptrRenderFrame is not // List is traversed beginning to end. If ptrRenderFrame is not
// NULL it must be the first, and thus oldest, VideoFrame in the // NULL it must be the first, and thus oldest, VideoFrame in the
// queue. It can be recycled. // queue. It can be recycled.
if (ptrRenderFrame) {
ReturnFrame(ptrRenderFrame); ReturnFrame(ptrRenderFrame);
iter = _incomingFrames.erase(iter); _incomingFrames.pop_front();
}
ptrRenderFrame = ptrOldestFrameInList; ptrRenderFrame = ptrOldestFrameInList;
} else { } else {
// All VideoFrames following this one will be even newer. No match // All VideoFrames following this one will be even newer. No match