Bug 1328547. part 2 - remove checks for IsShutdown() which is false in DecodingState. r?kaku draft
authorJW Wang <jwwang@mozilla.com>
Wed, 04 Jan 2017 17:13:49 +0800
changeset 456112 3428e7f7994cce42e7a0d2feb8be6e0b8d618cd7
parent 456111 fbc9ba6b5726df6f4238b0d3e99c3b14bc3f2e51
child 456113 6f1fc91c5e6f34a7acca338aa09ed785a6a8035b
push id40407
push userjwwang@mozilla.com
push dateThu, 05 Jan 2017 02:19:26 +0000
reviewerskaku
bugs1328547
milestone53.0a1
Bug 1328547. part 2 - remove checks for IsShutdown() which is false in DecodingState. r?kaku MozReview-Commit-ID: CmU79bt4XoR
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1993,23 +1993,23 @@ DecodingState::Enter()
 
   if (mMaster->CheckIfDecodeComplete()) {
     SetState<CompletedState>();
     return;
   }
 
   mOnAudioPopped = AudioQueue().PopEvent().Connect(
     OwnerThread(), [this] () {
-    if (!mMaster->IsShutdown() && mMaster->NeedToDecodeAudio()) {
+    if (mMaster->NeedToDecodeAudio()) {
       mMaster->EnsureAudioDecodeTaskQueued();
     }
   });
   mOnVideoPopped = VideoQueue().PopEvent().Connect(
     OwnerThread(), [this] () {
-    if (!mMaster->IsShutdown() && mMaster->NeedToDecodeVideo()) {
+    if (mMaster->NeedToDecodeVideo()) {
       mMaster->EnsureVideoDecodeTaskQueued();
     }
   });
 
   mMaster->UpdateNextFrameStatus(MediaDecoderOwner::NEXT_FRAME_AVAILABLE);
 
   mDecodeStartTime = TimeStamp::Now();