Bug 1286454 part 3 - remove MediaDecoderReader::mVideoDiscontinuity since it leads to nothing now; r?jwwang draft
authorKaku Kuo <kaku@mozilla.com>
Thu, 25 Aug 2016 18:16:05 +0800
changeset 405469 92722e3b78e7d740b05507d50f819f0884d39f9b
parent 405468 5cb19cabdb82426cb7e97ef4031d0667ae4fc515
child 405470 be87a8a36a5eedc1d8181a81bf24e68fe67ff5b7
push id27499
push userbmo:kaku@mozilla.com
push dateThu, 25 Aug 2016 14:33:57 +0000
reviewersjwwang
bugs1286454
milestone51.0a1
Bug 1286454 part 3 - remove MediaDecoderReader::mVideoDiscontinuity since it leads to nothing now; r?jwwang MozReview-Commit-ID: 1JMngmA61Bd
dom/media/MediaDecoderReader.cpp
dom/media/MediaDecoderReader.h
--- a/dom/media/MediaDecoderReader.cpp
+++ b/dom/media/MediaDecoderReader.cpp
@@ -219,17 +219,16 @@ MediaDecoderReader::MediaDecoderReader(A
   , mTaskQueue(new TaskQueue(GetMediaThreadPool(MediaThreadType::PLAYBACK),
                              /* aSupportsTailDispatch = */ true))
   , mWatchManager(this, mTaskQueue)
   , mBuffered(mTaskQueue, TimeIntervals(), "MediaDecoderReader::mBuffered (Canonical)")
   , mDuration(mTaskQueue, NullableTimeUnit(), "MediaDecoderReader::mDuration (Mirror)")
   , mIgnoreAudioOutputFormat(false)
   , mHitAudioDecodeError(false)
   , mShutdown(false)
-  , mVideoDiscontinuity(false)
   , mIsSuspended(mTaskQueue, true,
                  "MediaDecoderReader::mIsSuspended (Canonical)")
 {
   MOZ_COUNT_CTOR(MediaDecoderReader);
   MOZ_ASSERT(NS_IsMainThread());
 
   if (mDecoder && mDecoder->DataArrivedEvent()) {
     mDataArrivedListener = mDecoder->DataArrivedEvent()->Connect(
@@ -285,17 +284,16 @@ size_t MediaDecoderReader::SizeOfAudioQu
 {
   return mAudioQueue.GetSize();
 }
 
 nsresult MediaDecoderReader::ResetDecode(TrackSet aTracks)
 {
   if (aTracks.contains(TrackInfo::kVideoTrack)) {
     VideoQueue().Reset();
-    mVideoDiscontinuity = true;
     mBaseVideoPromise.RejectIfExists(CANCELED, __func__);
   }
 
   if (aTracks.contains(TrackInfo::kAudioTrack)) {
     AudioQueue().Reset();
     mBaseAudioPromise.RejectIfExists(CANCELED, __func__);
   }
 
@@ -451,19 +449,16 @@ MediaDecoderReader::RequestVideoData(boo
       // would hog the decode task queue.
       RefPtr<nsIRunnable> task(new ReRequestVideoWithSkipTask(this, aTimeThreshold));
       mTaskQueue->Dispatch(task.forget());
       return p;
     }
   }
   if (VideoQueue().GetSize() > 0) {
     RefPtr<VideoData> v = VideoQueue().PopFront();
-    if (v && mVideoDiscontinuity) {
-      mVideoDiscontinuity = false;
-    }
     mBaseVideoPromise.Resolve(v, __func__);
   } else if (VideoQueue().IsFinished()) {
     mBaseVideoPromise.Reject(END_OF_STREAM, __func__);
   } else {
     MOZ_ASSERT(false, "Dropping this promise on the floor");
   }
 
   return p;
--- a/dom/media/MediaDecoderReader.h
+++ b/dom/media/MediaDecoderReader.h
@@ -459,19 +459,16 @@ private:
     return false;
   }
 
   // Promises used only for the base-class (sync->async adapter) implementation
   // of Request{Audio,Video}Data.
   MozPromiseHolder<MediaDataPromise> mBaseAudioPromise;
   MozPromiseHolder<MediaDataPromise> mBaseVideoPromise;
 
-  // Flags whether a the next audio/video sample comes after a "gap" or
-  // "discontinuity" in the stream. For example after a seek.
-  bool mVideoDiscontinuity;
   Canonical<bool> mIsSuspended;
 
   MediaEventListener mDataArrivedListener;
 };
 
 } // namespace mozilla
 
 #endif