From e1c0f361aad61c7be6e0fdee1fcd23ad51f64390 Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Mon, 9 Jan 2017 20:27:36 +0800
Subject: [PATCH] Bug 1329897. Part 3 - call Request{Audio,Video}Data instead.
 r=kaku

For HandleAudioCanceled():
1. IsRequestingAudioData() is false because mAudioDataRequest is completed in MDSM::RequestAudioData().
2. IsWaitingAudioData() is false because data promsie and wait promise are mutually exclusive.
3. IsAudioDecoding() is true because we wouldn't have requested audio data otherwise.

Likewise, we can prove EnsureAudioDecodeTaskQueued() can be reduced to mMaster->RequestAudioData()
in HandleAudioWaited.

MozReview-Commit-ID: 1i63IMfZaUh

--HG--
extra : rebase_source : ac389a7ccc74d969ecfc5f5f622c1c90e2d9b118
extra : intermediate-source : 50bb6d229443be0c410daf7c9553e84cd21fd929
extra : source : f4c3f02f3741c49eed38c2aaab5c872d18fb74ff
---
 dom/media/MediaDecoderStateMachine.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dom/media/MediaDecoderStateMachine.cpp b/dom/media/MediaDecoderStateMachine.cpp
index e1982acc5e9f..8f721bdf5da0 100644
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1651,12 +1651,12 @@ public:
 
   void HandleAudioCanceled() override
   {
-    EnsureAudioDecodeTaskQueued();
+    mMaster->RequestAudioData();
   }
 
   void HandleVideoCanceled() override
   {
-    EnsureVideoDecodeTaskQueued();
+    mMaster->RequestVideoData(false, media::TimeUnit());
   }
 
   void HandleWaitingForAudio() override
@@ -1671,12 +1671,12 @@ public:
 
   void HandleAudioWaited(MediaData::Type aType) override
   {
-    EnsureAudioDecodeTaskQueued();
+    mMaster->RequestAudioData();
   }
 
   void HandleVideoWaited(MediaData::Type aType) override
   {
-    EnsureVideoDecodeTaskQueued();
+    mMaster->RequestVideoData(false, media::TimeUnit());
   }
 
   void HandleEndOfAudio() override;