Bug 1322800 part 2 - move NextFrameSeekTask::CalculateNewCurrentTime(); r?jwwang draft
authorKaku Kuo <kaku@mozilla.com>
Wed, 14 Dec 2016 11:21:24 +0800
changeset 450257 b1452ec4c110156f519e964e15cc84bbfb07ecd7
parent 450256 c0342b640b46a7f974b356f8daf760a291cda85b
child 450258 1e6c181cc659c8a1aa7871427365a55fdd6589db
push id38817
push userbmo:kaku@mozilla.com
push dateFri, 16 Dec 2016 08:40:33 +0000
reviewersjwwang
bugs1322800
milestone53.0a1
Bug 1322800 part 2 - move NextFrameSeekTask::CalculateNewCurrentTime(); r?jwwang MozReview-Commit-ID: 8plgauwNBme
dom/media/MediaDecoderStateMachine.cpp
dom/media/NextFrameSeekTask.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1399,17 +1399,19 @@ private:
     if (!mTask->IsVideoRequestPending() && mTask->NeedMoreVideo()) {
       mTask->RequestVideoData();
     }
     mTask->MaybeFinishSeek(); // Might resolve mSeekTaskPromise and modify audio queue.
   }
 
   int64_t CalculateNewCurrentTime() const override
   {
-    return mSeekTask->CalculateNewCurrentTime();
+    // The HTMLMediaElement.currentTime should be updated to the seek target
+    // which has been updated to the next frame's time.
+    return mTask->mTarget.GetTime().ToMicroseconds();
   }
 
   void OnSeekTaskResolved(const SeekTaskResolveValue& aValue)
   {
     mSeekTaskRequest.Complete();
 
     if (aValue.mSeekedAudioData) {
       mMaster->Push(aValue.mSeekedAudioData);
--- a/dom/media/NextFrameSeekTask.cpp
+++ b/dom/media/NextFrameSeekTask.cpp
@@ -54,20 +54,17 @@ NextFrameSeekTask::Discard()
 
   mIsDiscarded = true;
 }
 
 int64_t
 NextFrameSeekTask::CalculateNewCurrentTime() const
 {
   AssertOwnerThread();
-
-  // The HTMLMediaElement.currentTime should be updated to the seek target
-  // which has been updated to the next frame's time.
-  return mTarget.GetTime().ToMicroseconds();
+  return 0;
 }
 
 void
 NextFrameSeekTask::HandleAudioDecoded(MediaData* aAudio)
 {
   AssertOwnerThread();
   MOZ_ASSERT(aAudio);
   MOZ_ASSERT(!mSeekTaskPromise.IsEmpty(), "Seek shouldn't be finished");