From 9c7685f9a6255d9538d990a036f6ee48015b6d70 Mon Sep 17 00:00:00 2001 From: "mikhal@webrtc.org" Date: Tue, 7 May 2013 16:07:52 +0000 Subject: [PATCH] VCM/JB: Break and skip to key if possible BUG=1734 R=stefan@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1421004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3969 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/video_coding/main/source/jitter_buffer.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/video_coding/main/source/jitter_buffer.cc b/webrtc/modules/video_coding/main/source/jitter_buffer.cc index fb3578dbe..fecefc93f 100644 --- a/webrtc/modules/video_coding/main/source/jitter_buffer.cc +++ b/webrtc/modules/video_coding/main/source/jitter_buffer.cc @@ -466,8 +466,7 @@ VCMEncodedFrame* VCMJitterBuffer::GetCompleteFrameForDecoding( break; } } else { - crit_sect_->Leave(); - return NULL; + break; } } // Inside |crit_sect_|. @@ -477,7 +476,7 @@ VCMEncodedFrame* VCMJitterBuffer::GetCompleteFrameForDecoding( } if (!decode_with_errors_ && it == frame_list_.end()) { - // Even after signaling we're still missing a complete continuous frame. + // We're still missing a complete continuous frame. // Look for a complete key frame if we're not decoding with errors. it = find_if(frame_list_.begin(), frame_list_.end(), CompleteKeyFrameCriteria()); @@ -564,7 +563,7 @@ VCMEncodedFrame* VCMJitterBuffer::MaybeGetIncompleteFrameForDecoding() { frame_list_.erase(frame_list_.begin()); if (frame_list_.empty()) { TRACE_EVENT_INSTANT1("webrtc", "JB::FrameListEmptied", - "type", "GetFrameForDecoding"); + "type", "MaybeGetIncompleteFrameForDecoding"); } // Look for previous frame loss