From ba927c6dfe097c14e76a89cb5af105d5360fc390 Mon Sep 17 00:00:00 2001 From: JW Wang Date: Thu, 5 Jan 2017 14:38:52 +0800 Subject: [PATCH] Bug 1328811. Part 1 - remove the assertion. r=kaku http://searchfox.org/mozilla-central/rev/82ebc0c5ea45477ef4a4bfb3bbff35069bd18cee/dom/media/MediaDecoderStateMachine.cpp#2980 The if statement ensures |mState != DECODER_STATE_COMPLETED|. MozReview-Commit-ID: CyvfXj94E8s --HG-- extra : rebase_source : 10007fda9e4c09647a7142b77415c332a69001b3 extra : source : 5936c72d33e155a2a942602b610e6d6407f9bef6 --- dom/media/MediaDecoderStateMachine.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp index 727a05973478..c24274610a66 100644 --- a/dom/media/MediaDecoderStateMachine.cpp +++ b/dom/media/MediaDecoderStateMachine.cpp @@ -2991,10 +2991,6 @@ MediaDecoderStateMachine::DispatchDecodeTasksIfNeeded() const bool needToDecodeAudio = NeedToDecodeAudio(); const bool needToDecodeVideo = NeedToDecodeVideo(); - // If we're in completed state, we should not need to decode anything else. - MOZ_ASSERT(mState != DECODER_STATE_COMPLETED || - (!needToDecodeAudio && !needToDecodeVideo)); - SAMPLE_LOG("DispatchDecodeTasksIfNeeded needAudio=%d audioStatus=%s needVideo=%d videoStatus=%s", needToDecodeAudio, AudioRequestStatus(), needToDecodeVideo, VideoRequestStatus());