Bug 1282658. Part 10 - merge Request{Audio,Video}Data() into Ensure{Audio,Video}DecodeTaskQueued() for the logs are not quite useful. r=kaku

MozReview-Commit-ID: G1M9St1uLaN

--HG--
extra : rebase_source : a4fd0165fdf10836407595557f1243ecfe55663d

dom/media/AccurateSeekTask.cpp

@@ -123,7 +123,7 @@ AccurateSeekTask::EnsureAudioDecodeTaskQueued()
     return;
   }
 
-  RequestAudioData();
+  mReader->RequestAudioData();
 }
 
 void
@@ -139,7 +139,7 @@ AccurateSeekTask::EnsureVideoDecodeTaskQueued()
     return;
   }
 
-  RequestVideoData();
+  mReader->RequestVideoData(false, media::TimeUnit());
 }
 
 const char*
@@ -170,27 +170,6 @@ AccurateSeekTask::VideoRequestStatus()
   return "idle";
 }
 
-void
-AccurateSeekTask::RequestAudioData()
-{
-  AssertOwnerThread();
-  SAMPLE_LOG("Queueing audio task - queued=%i, decoder-queued=%o",
-             !!mSeekedAudioData, mReader->SizeOfAudioQueueInFrames());
-
-  mReader->RequestAudioData();
-}
-
-void
-AccurateSeekTask::RequestVideoData()
-{
-  AssertOwnerThread();
-  SAMPLE_LOG("Queueing video task - queued=%i, decoder-queued=%o, skip=%i, time=%lld",
-               !!mSeekedVideoData, mReader->SizeOfVideoQueueInFrames(), false,
-               media::TimeUnit().ToMicroseconds());
-
-  mReader->RequestVideoData(false, media::TimeUnit());
-}
-
 nsresult
 AccurateSeekTask::DropAudioUpToSeekTarget(MediaData* aSample)
 {

dom/media/AccurateSeekTask.h

@@ -41,10 +41,6 @@ private:
 
   const char* VideoRequestStatus();
 
-  void RequestVideoData();
-
-  void RequestAudioData();
-
   nsresult DropAudioUpToSeekTarget(MediaData* aSample);
 
   nsresult DropVideoUpToSeekTarget(MediaData* aSample);