From 8f72f1ce87a49a7ec969fb7917315838ae1eb41e Mon Sep 17 00:00:00 2001
From: Kaku Kuo <kaku@mozilla.com>
Date: Thu, 25 Aug 2016 18:18:22 +0800
Subject: [PATCH] Bug 1286454 part 4 - remove DecoderData::mDiscontinuity since
 it leads to nothing now; r=jwwang

MozReview-Commit-ID: I6Qzq1p6GyT

--HG--
extra : rebase_source : 796fa9611c31068cec69b631b26e542ae1cf4295
---
 dom/media/MediaFormatReader.cpp | 8 +-------
 dom/media/MediaFormatReader.h   | 3 ---
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/dom/media/MediaFormatReader.cpp b/dom/media/MediaFormatReader.cpp
index 15b29ae905f6..6053a3cc3f2f 100644
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -1320,14 +1320,8 @@ MediaFormatReader::Update(TrackType aTrack)
 void
 MediaFormatReader::ReturnOutput(MediaData* aData, TrackType aTrack)
 {
-  auto& decoder = GetDecoderData(aTrack);
-  MOZ_ASSERT(decoder.HasPromise());
+  MOZ_ASSERT(GetDecoderData(aTrack).HasPromise());
   MOZ_DIAGNOSTIC_ASSERT(aData->mType != MediaData::NULL_DATA);
-  if (decoder.mDiscontinuity) {
-    LOGV("Setting discontinuity flag");
-    decoder.mDiscontinuity = false;
-  }
-
   LOG("Resolved data promise for %s [%lld, %lld]", TrackTypeToStr(aTrack),
       aData->mTime, aData->GetEndTime());
 
diff --git a/dom/media/MediaFormatReader.h b/dom/media/MediaFormatReader.h
index d223d1ef112a..1c61b4644437 100644
--- a/dom/media/MediaFormatReader.h
+++ b/dom/media/MediaFormatReader.h
@@ -242,7 +242,6 @@ private:
       , mDemuxEOS(false)
       , mWaitingForData(false)
       , mReceivedNewData(false)
-      , mDiscontinuity(true)
       , mDecoderInitialized(false)
       , mDecodingRequested(false)
       , mOutputRequested(false)
@@ -294,7 +293,6 @@ private:
     bool mDemuxEOS;
     bool mWaitingForData;
     bool mReceivedNewData;
-    bool mDiscontinuity;
 
     // Pending seek.
     MozPromiseRequestHolder<MediaTrackDemuxer::SeekPromise> mSeekRequest;
@@ -398,7 +396,6 @@ private:
       MOZ_ASSERT(mOwner->OnTaskQueue());
       mDemuxEOS = false;
       mWaitingForData = false;
-      mDiscontinuity = true;
       mQueuedSamples.Clear();
       mDecodingRequested = false;
       mOutputRequested = false;