From d3cf895857a5312457d272b038ac84f3cb0007bf Mon Sep 17 00:00:00 2001
From: Kaku Kuo <kaku@mozilla.com>
Date: Thu, 6 Jul 2017 11:45:07 +0800
Subject: [PATCH] Bug 1378085 p4 - override HandleAudioDecoded(); r=jwwang

MozReview-Commit-ID: BmxePYCesTF

--HG--
extra : rebase_source : c0be25b11a415e5b463841b72594bbd2de0be59b
---
 dom/media/MediaDecoderStateMachine.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index b5dd25cf5de2..94855db2c6dc 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1056,15 +1056,6 @@ public:
                "Seek shouldn't be finished");
     MOZ_ASSERT(aAudio);
 
-    // Video-only seek doesn't reset audio decoder. There might be pending audio
-    // requests when AccurateSeekTask::Seek() begins. We will just store the
-    // data without checking |mDiscontinuity| or calling
-    // DropAudioUpToSeekTarget().
-    if (mSeekJob.mTarget->IsVideoOnly()) {
-      mMaster->PushAudio(aAudio);
-      return;
-    }
-
     AdjustFastSeekIfNeeded(aAudio);
 
     if (mSeekJob.mTarget->IsFast()) {
@@ -1787,6 +1778,19 @@ public:
 
     AccurateSeekingState::Exit();
   }
+
+  void HandleAudioDecoded(AudioData* aAudio) override
+  {
+    MOZ_ASSERT(mDoneAudioSeeking && !mDoneVideoSeeking,
+               "Seek shouldn't be finished");
+    MOZ_ASSERT(aAudio);
+
+    // Video-only seek doesn't reset audio decoder. There might be pending audio
+    // requests when AccurateSeekTask::Seek() begins. We will just store the
+    // data without checking |mDiscontinuity| or calling
+    // DropAudioUpToSeekTarget().
+    mMaster->PushAudio(aAudio);
+  }
 };
 
 RefPtr<MediaDecoder::SeekPromise>