From 95bd4f71d1019e12a0da882d24a083d1d2b43a94 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Tue, 1 Apr 2014 08:58:55 -0400 Subject: [PATCH] Bug 980868 - Don't skip video frame when |clock time| is less than |mVideoFrameEndTime| for we are still in the safe range without underruning video frames. r=cpearce --- content/media/MediaDecoderStateMachine.cpp | 3 +++ content/media/test/mochitest.ini | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp index 9f63c1d9eeb0..4470cc81d2ea 100644 --- a/content/media/MediaDecoderStateMachine.cpp +++ b/content/media/MediaDecoderStateMachine.cpp @@ -591,6 +591,9 @@ MediaDecoderStateMachine::DecodeVideo() ((!mIsAudioPrerolling && mIsAudioDecoding && GetDecodedAudioDuration() < mLowAudioThresholdUsecs * mPlaybackRate) || (!mIsVideoPrerolling && mIsVideoDecoding && + // don't skip frame when |clock time| <= |mVideoFrameEndTime| for + // we are still in the safe range without underrunning video frames + GetClock() > mVideoFrameEndTime && (static_cast(mReader->VideoQueue().GetSize()) < LOW_VIDEO_FRAMES * mPlaybackRate))) && !HasLowUndecodedData()) diff --git a/content/media/test/mochitest.ini b/content/media/test/mochitest.ini index 06701431a22c..6c602d83c309 100644 --- a/content/media/test/mochitest.ini +++ b/content/media/test/mochitest.ini @@ -432,7 +432,6 @@ skip-if = buildapp == 'b2g' # b2g(Test timed out, bug 668973?) b2g-debug(Test ti [test_reset_src.html] [test_streams_autoplay.html] [test_streams_element_capture.html] -skip-if = buildapp == 'b2g' # b2g(bug 900172 - timeouts) b2g-debug(bug 900172 - timeouts) b2g-desktop(bug 900172 - timeouts) [test_streams_element_capture_reset.html] skip-if = buildapp == 'b2g' # b2g(bug 901102) b2g-debug(bug 901102) b2g-desktop(bug 901102) [test_streams_element_capture_createObjectURL.html]