Bug 1252344. Part 1 - remove unnecessary checks from MediaDecoderStateMachine::NeedToDecodeVideo(). r=bechen. draft
authorJW Wang <jwwang@mozilla.com>
Wed, 02 Mar 2016 10:39:20 +0800
changeset 336021 c6daf863e720d5757c57c6e21c94ffa2115824b1
parent 335982 eb25b90a05c194bfd4f498ff3ffee7440f85f1cd
child 336022 2df7a30f28440478a8223f4e1b11d3c85c29093a
push id11943
push userjwwang@mozilla.com
push dateWed, 02 Mar 2016 02:50:54 +0000
reviewersbechen
bugs1252344
milestone47.0a1
Bug 1252344. Part 1 - remove unnecessary checks from MediaDecoderStateMachine::NeedToDecodeVideo(). r=bechen. MozReview-Commit-ID: Jgo9g5B9yq
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -487,18 +487,17 @@ MediaDecoderStateMachine::NeedToDecodeVi
 {
   MOZ_ASSERT(OnTaskQueue());
   SAMPLE_LOG("NeedToDecodeVideo() isDec=%d decToTar=%d minPrl=%d seek=%d enufVid=%d",
              IsVideoDecoding(), mDecodeToSeekTarget, mMinimizePreroll,
              mState == DECODER_STATE_SEEKING,
              HaveEnoughDecodedVideo());
   return IsVideoDecoding() &&
          ((mState == DECODER_STATE_SEEKING && mDecodeToSeekTarget) ||
-          (IsDecodingFirstFrame() &&
-           IsVideoDecoding() && VideoQueue().GetSize() == 0) ||
+          (IsDecodingFirstFrame() && VideoQueue().GetSize() == 0) ||
           (!mMinimizePreroll && !HaveEnoughDecodedVideo()));
 }
 
 bool
 MediaDecoderStateMachine::NeedToSkipToNextKeyframe()
 {
   MOZ_ASSERT(OnTaskQueue());
   if (IsDecodingFirstFrame()) {