Bug 1114830 - Only enter buffering mode when the pending request is waiting for data. r=cpearce a=philor

2014-12-22 20:54:01 -08:00
parent 4503623732
commit 5eb688e802
2 changed files with 3 additions and 1 deletions
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2958,7 +2958,8 @@ void MediaDecoderStateMachine::AdvanceFrame()
                     (JustExitedQuickBuffering() || HasLowUndecodedData());
    } else {
      MOZ_ASSERT(mReader->IsWaitForDataSupported());
-      shouldBuffer = OutOfDecodedAudio() || OutOfDecodedVideo();
+      shouldBuffer = (OutOfDecodedAudio() && mAudioRequestStatus == RequestStatus::Waiting) ||
+                     (OutOfDecodedVideo() && mVideoRequestStatus == RequestStatus::Waiting);
    }
    if (shouldBuffer) {
      if (currentFrame) {