Bug 1252360 - remove some check from NeedToDecodeAudio(). r=bechen. draft
authorJW Wang <jwwang@mozilla.com>
Thu, 03 Mar 2016 10:52:07 +0800
changeset 336395 9ec5ec38ef99ee97ae2ad9013a6c1fe203e41acb
parent 336378 4ea7408b3eef059aa248f4b00328f8fdb4475112
child 336457 1a5d4616693c77f4a54848b8aa0585eaf6b1b213
push id12052
push userjwwang@mozilla.com
push dateThu, 03 Mar 2016 03:36:17 +0000
reviewersbechen
bugs1252360
milestone47.0a1
Bug 1252360 - remove some check from NeedToDecodeAudio(). r=bechen. MozReview-Commit-ID: J8kuQDQAEj9
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -560,18 +560,17 @@ MediaDecoderStateMachine::NeedToDecodeAu
              IsAudioDecoding(), mDecodeToSeekTarget, mMinimizePreroll,
              mState == DECODER_STATE_SEEKING,
              HaveEnoughDecodedAudio(mAmpleAudioThresholdUsecs * mPlaybackRate));
 
   return IsAudioDecoding() &&
          ((mState == DECODER_STATE_SEEKING && mDecodeToSeekTarget) ||
           (IsDecodingFirstFrame() && AudioQueue().GetSize() == 0) ||
           (!mMinimizePreroll &&
-           !HaveEnoughDecodedAudio(mAmpleAudioThresholdUsecs * mPlaybackRate) &&
-           (mState != DECODER_STATE_SEEKING || mDecodeToSeekTarget)));
+           !HaveEnoughDecodedAudio(mAmpleAudioThresholdUsecs * mPlaybackRate)));
 }
 
 bool
 MediaDecoderStateMachine::IsAudioSeekComplete()
 {
   MOZ_ASSERT(OnTaskQueue());
   SAMPLE_LOG("IsAudioSeekComplete() curTarVal=%d mAudDis=%d aqFin=%d aqSz=%d",
     mCurrentSeek.Exists(), mDropAudioUntilNextDiscontinuity, AudioQueue().IsFinished(), AudioQueue().GetSize());