Bug 1329554. Part 2 - remove |mMaster->mMinimizePreroll| checks from BufferingState::Step(). draft
authorJW Wang <jwwang@mozilla.com>
Thu, 05 Jan 2017 18:13:54 +0800
changeset 457494 dd70f490ed45e3eb5b92f2ceb89fceaefc4aa304
parent 457493 a2f4f69fde0ed8dd5a1b280713b6d462f407bb2e
child 457495 cdc7a1f3941465745814d1807f6faec15e9d09b9
push id40790
push userjwwang@mozilla.com
push dateMon, 09 Jan 2017 03:21:20 +0000
bugs1329554
milestone53.0a1
Bug 1329554. Part 2 - remove |mMaster->mMinimizePreroll| checks from BufferingState::Step(). mMinimizePreroll is false in BufferingState because we enter buffering only after playback starts. MozReview-Commit-ID: 9vRuogzvV7x
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2232,22 +2232,20 @@ BufferingState::Step()
       SLOG("Buffering: wait %ds, timeout in %.3lfs",
            mBufferingWait, mBufferingWait - elapsed.ToSeconds());
       mMaster->ScheduleStateMachineIn(USECS_PER_S);
       mMaster->DispatchDecodeTasksIfNeeded();
       return;
     }
   } else if (mMaster->OutOfDecodedAudio() || mMaster->OutOfDecodedVideo()) {
     mMaster->DispatchDecodeTasksIfNeeded();
-    MOZ_ASSERT(mMaster->mMinimizePreroll ||
-               !mMaster->OutOfDecodedAudio() ||
+    MOZ_ASSERT(!mMaster->OutOfDecodedAudio() ||
                mMaster->IsRequestingAudioData() ||
                mMaster->IsWaitingAudioData());
-    MOZ_ASSERT(mMaster->mMinimizePreroll ||
-               !mMaster->OutOfDecodedVideo() ||
+    MOZ_ASSERT(!mMaster->OutOfDecodedVideo() ||
                mMaster->IsRequestingVideoData() ||
                mMaster->IsWaitingVideoData());
     SLOG("In buffering mode, waiting to be notified: outOfAudio: %d, "
          "mAudioStatus: %s, outOfVideo: %d, mVideoStatus: %s",
          mMaster->OutOfDecodedAudio(), mMaster->AudioRequestStatus(),
          mMaster->OutOfDecodedVideo(), mMaster->VideoRequestStatus());
     return;
   }