Bug 1283785. Part 3 - merge and remove unused functions. r=kaku draft
authorJW Wang <jwwang@mozilla.com>
Fri, 01 Jul 2016 17:55:41 +0800
changeset 386519 1194596e5516a4241f0c03f228c3496667421e61
parent 386518 620175f87586075625ae3f57911f8f291a5320aa
child 386520 fc516865f9434192970ac89674b4731788226b86
push id22731
push userjwwang@mozilla.com
push dateTue, 12 Jul 2016 05:50:43 +0000
reviewerskaku
bugs1283785
milestone50.0a1
Bug 1283785. Part 3 - merge and remove unused functions. r=kaku MozReview-Commit-ID: IC5bTvawVGm
dom/media/NextFrameSeekTask.cpp
dom/media/NextFrameSeekTask.h
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -113,57 +113,26 @@ NextFrameSeekTask::Seek(const media::Tim
 
   auto currentTime = mCurrentTime;
   DiscardFrames(mVideoQueue, [currentTime] (int64_t aSampleTime) {
     return aSampleTime <= currentTime;
   });
 
   RefPtr<SeekTaskPromise> promise = mSeekTaskPromise.Ensure(__func__);
   if (!IsVideoRequestPending() && NeedMoreVideo()) {
-    EnsureVideoDecodeTaskQueued();
+    RequestVideoData();
   }
   MaybeFinishSeek(); // Might resolve mSeekTaskPromise and modify audio queue.
   return promise;
 }
 
-bool
-NextFrameSeekTask::IsVideoDecoding() const
-{
-  AssertOwnerThread();
-  return !mIsVideoQueueFinished;
-}
-
-void
-NextFrameSeekTask::EnsureVideoDecodeTaskQueued()
-{
-  AssertOwnerThread();
-  RequestVideoData();
-}
-
-const char*
-NextFrameSeekTask::VideoRequestStatus()
-{
-  AssertOwnerThread();
-
-  if (mReader->IsRequestingVideoData()) {
-    MOZ_DIAGNOSTIC_ASSERT(!mReader->IsWaitingVideoData());
-    return "pending";
-  } else if (mReader->IsWaitingVideoData()) {
-    return "waiting";
-  }
-  return "idle";
-}
-
 void
 NextFrameSeekTask::RequestVideoData()
 {
   AssertOwnerThread();
-  SAMPLE_LOG("Queueing video task - queued=%i, decoder-queued=%o",
-             !!mSeekedVideoData, mReader->SizeOfVideoQueueInFrames());
-
   mReader->RequestVideoData(false, media::TimeUnit());
 }
 
 bool
 NextFrameSeekTask::NeedMoreVideo() const
 {
   AssertOwnerThread();
   // Need to request video when we have none and video queue is not finished.
@@ -265,17 +234,17 @@ NextFrameSeekTask::OnVideoDecoded(MediaD
              aVideoSample->GetEndTime(),
              aVideoSample->mDiscontinuity);
 
   if (aVideoSample->mTime > mCurrentTime) {
     mSeekedVideoData = aVideoSample;
   }
 
   if (NeedMoreVideo()) {
-    EnsureVideoDecodeTaskQueued();
+    RequestVideoData();
     return;
   }
 
   MaybeFinishSeek();
 }
 
 void
 NextFrameSeekTask::OnVideoNotDecoded(MediaDecoderReader::NotDecodedReason aReason)
@@ -299,17 +268,17 @@ NextFrameSeekTask::OnVideoNotDecoded(Med
         CancelCallbacks();
         // Reject the promise since we can't finish video seek anyway.
         RejectIfExist(__func__);
         break;
       case MediaDecoderReader::WAITING_FOR_DATA:
         mReader->WaitForData(MediaData::VIDEO_DATA);
         break;
       case MediaDecoderReader::CANCELED:
-        EnsureVideoDecodeTaskQueued();
+        RequestVideoData();
         break;
       case MediaDecoderReader::END_OF_STREAM:
         MOZ_ASSERT(false, "Shouldn't want more data for ended video.");
         break;
     }
     return;
   }
 
@@ -348,17 +317,17 @@ NextFrameSeekTask::SetCallbacks()
     // trigger further audio decode tasks if MDSM itself needs to play audio.
     MaybeFinishSeek();
   });
 
   mVideoWaitCallback = mReader->VideoWaitCallback().Connect(
     OwnerThread(), [this] (WaitCallbackData aData) {
     if (NeedMoreVideo()) {
       if (aData.is<MediaData::Type>()) {
-        EnsureVideoDecodeTaskQueued();
+        RequestVideoData();
       } else {
         // Reject if we can't finish video seeking.
         CancelCallbacks();
         RejectIfExist(__func__);
       }
       return;
     }
     MaybeFinishSeek();
--- a/dom/media/NextFrameSeekTask.h
+++ b/dom/media/NextFrameSeekTask.h
@@ -38,22 +38,16 @@ public:
 
   RefPtr<SeekTaskPromise> Seek(const media::TimeUnit& aDuration) override;
 
   bool NeedToResetMDSM() const override;
 
 private:
   ~NextFrameSeekTask();
 
-  bool IsVideoDecoding() const;
-
-  void EnsureVideoDecodeTaskQueued();
-
-  const char* VideoRequestStatus();
-
   void RequestVideoData();
 
   bool NeedMoreVideo() const;
 
   bool IsVideoRequestPending() const;
 
   bool IsAudioSeekComplete() const;