From fbe625863b0e2a25532eb616843243b313c4de24 Mon Sep 17 00:00:00 2001 From: Alastor Wu Date: Mon, 24 Jul 2017 10:07:30 +0800 Subject: [PATCH] Bug 1367983 - revert the change of bug1367980. r=jwwang In bug1371202, it has already implemented what I want to do, so remove the change in bug1367980. MozReview-Commit-ID: LoH51bBDTqr --HG-- extra : rebase_source : 9fd77acae81f94e45f0f840775c81509e85c4ad0 --- dom/media/MediaDecoderStateMachine.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp index eef76bb243fe..cbfae1095cc4 100644 --- a/dom/media/MediaDecoderStateMachine.cpp +++ b/dom/media/MediaDecoderStateMachine.cpp @@ -1957,15 +1957,12 @@ public: void Enter() { - // TODO : use more approriate way to decide whether need to release - // resource in bug1367983. -#ifndef MOZ_WIDGET_ANDROID if (!mMaster->mLooping) { // We've decoded all samples. // We don't need decoders anymore if not looping. Reader()->ReleaseResources(); } -#endif + bool hasNextFrame = (!mMaster->HasAudio() || !mMaster->mAudioCompleted) && (!mMaster->HasVideo() || !mMaster->mVideoCompleted);