Bug 1300069 - Remove TrackBuffersManager::mIsEncrypted. r=jya, a=ritu
authorChris Pearce <cpearce@mozilla.com>
Wed, 28 Sep 2016 13:45:25 +1300
changeset 350478 d67b181d7d110749da56d42fa35a0921dfe3b289
parent 350477 996a38715d67295d7a68af0ef46b4f5cef4f3acd
child 350479 4568e903025292248e6d3d9d9acde664706dcf8a
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya, ritu
bugs1300069
milestone50.0
Bug 1300069 - Remove TrackBuffersManager::mIsEncrypted. r=jya, a=ritu 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
@@ -1053,17 +1053,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
@@ -230,17 +230,16 @@ private:
   // Length already processed in current media segment.
   uint32_t mProcessedInput;
   Maybe<media::TimeUnit> mLastParsedEndTime;
 
   void OnDemuxerInitDone(nsresult);
   void OnDemuxerInitFailed(DemuxerFailureReason aFailure);
   void OnDemuxerResetDone(nsresult);
   MozPromiseRequestHolder<MediaDataDemuxer::InitPromise> mDemuxerInitRequest;
-  bool mEncrypted;
 
   void OnDemuxFailed(TrackType aTrack, DemuxerFailureReason aFailure);
   void DoDemuxVideo();
   void OnVideoDemuxCompleted(RefPtr<MediaTrackDemuxer::SamplesHolder> aSamples);
   void OnVideoDemuxFailed(DemuxerFailureReason aFailure)
   {
     mVideoTracks.mDemuxRequest.Complete();
     OnDemuxFailed(TrackType::kVideoTrack, aFailure);