From a3a230f2cb2a9bf17d123c030f8999867bbd1c4f Mon Sep 17 00:00:00 2001 From: "stefan@webrtc.org" Date: Thu, 27 Sep 2012 10:00:38 +0000 Subject: [PATCH] Fixes potential race in the jitter buffer. BUG=879 Review URL: https://webrtc-codereview.appspot.com/845007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2831 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_coding/main/source/jitter_buffer.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/video_coding/main/source/jitter_buffer.cc b/src/modules/video_coding/main/source/jitter_buffer.cc index 23f2e48f06..0c4dd33fa9 100644 --- a/src/modules/video_coding/main/source/jitter_buffer.cc +++ b/src/modules/video_coding/main/source/jitter_buffer.cc @@ -787,11 +787,11 @@ VCMJitterBuffer::GetCompleteFrameForDecoding(WebRtc_UWord32 maxWaitTimeMS) _waitingForKeyFrame = false; } - _critSect->Leave(); - // We have a frame - update decoded state with frame info. _lastDecodedState.SetState(oldestFrame); + _critSect->Leave(); + return oldestFrame; }