Bug 1300069 - Remove TrackBuffersManager::mIsEncrypted. r?jya draft
authorChris Pearce <cpearce@mozilla.com>
Wed, 28 Sep 2016 13:45:25 +1300
changeset 418236 e084efc11c06ad23380e8a3bd0913aecca8abcaa
parent 418235 99f2793850729a6826cf3fef35a5cdaa711b2f3b
child 532308 4037508e7e6d6009d3873b867b6625357f05dccf
push id30644
push usercpearce@mozilla.com
push dateWed, 28 Sep 2016 01:15:36 +0000
reviewersjya
bugs1300069
milestone52.0a1
Bug 1300069 - Remove TrackBuffersManager::mIsEncrypted. r?jya It's write only, so there's no point storing this, and it's not accurate anyway, as it's actually tracking whether there's encrypted init data in the media, not whether its got encrypted tracks. MozReview-Commit-ID: 78iFUyXwRBV
dom/media/mediasource/TrackBuffersManager.cpp
dom/media/mediasource/TrackBuffersManager.h
--- a/dom/media/mediasource/TrackBuffersManager.cpp
+++ b/dom/media/mediasource/TrackBuffersManager.cpp
@@ -1069,17 +1069,16 @@ TrackBuffersManager::OnDemuxerInitDone(n
         new DispatchKeyNeededEvent(mParentDecoder, crypto->mInitDatas[i].mInitData,
                                    crypto->mInitDatas[i].mType));
     }
 #endif // MOZ_EME
     info.mCrypto = *crypto;
     // We clear our crypto init data array, so the MediaFormatReader will
     // not emit an encrypted event for the same init data again.
     info.mCrypto.mInitDatas.Clear();
-    mEncrypted = true;
   }
 
   {
     MonitorAutoLock mon(mMonitor);
     mInfo = info;
   }
 
   // We now have a valid init data ; we can store it for later use.
--- a/dom/media/mediasource/TrackBuffersManager.h
+++ b/dom/media/mediasource/TrackBuffersManager.h
@@ -234,17 +234,16 @@ private:
   // Length already processed in current media segment.
   uint32_t mProcessedInput;
   Maybe<media::TimeUnit> mLastParsedEndTime;
 
   void OnDemuxerInitDone(nsresult);
   void OnDemuxerInitFailed(const MediaResult& aFailure);
   void OnDemuxerResetDone(nsresult);
   MozPromiseRequestHolder<MediaDataDemuxer::InitPromise> mDemuxerInitRequest;
-  bool mEncrypted;
 
   void OnDemuxFailed(TrackType aTrack, const MediaResult& aError);
   void DoDemuxVideo();
   void OnVideoDemuxCompleted(RefPtr<MediaTrackDemuxer::SamplesHolder> aSamples);
   void OnVideoDemuxFailed(const MediaResult& aError)
   {
     mVideoTracks.mDemuxRequest.Complete();
     OnDemuxFailed(TrackType::kVideoTrack, aError);