Bug 1316211. P6 - move some members from MDR into MFR. r=gerald
authorJW Wang <jwwang@mozilla.com>
Wed, 19 Jul 2017 14:27:24 +0800
changeset 418805 a29ccfcca3b0f7e962b8fc444bc9ac6ef149b22c
parent 418804 91d790b237c0cb2efc916d75f065048e570b96eb
child 418806 569f0d24bfda2c49dda381cd6714e52eaf4ab2cc
push id7566
push usermtabara@mozilla.com
push dateWed, 02 Aug 2017 08:25:16 +0000
treeherdermozilla-beta@86913f512c3c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgerald
bugs1316211
milestone56.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1316211. P6 - move some members from MDR into MFR. r=gerald MozReview-Commit-ID: 9H17UZjpCDT
dom/media/MediaDecoderReader.h
dom/media/MediaFormatReader.h
--- a/dom/media/MediaDecoderReader.h
+++ b/dom/media/MediaDecoderReader.h
@@ -295,19 +295,16 @@ protected:
   AbstractMediaDecoder* mDecoder;
 
   // Decode task queue.
   RefPtr<TaskQueue> mTaskQueue;
 
   // Buffered range.
   Canonical<media::TimeIntervals> mBuffered;
 
-  // Stores presentation info required for playback.
-  MediaInfo mInfo;
-
   media::NullableTimeUnit mDuration;
 
   bool mShutdown;
 
   // Used to send TimedMetadata to the listener.
   TimedMetadataEventProducer mTimedMetadataEvent;
 
   // Notify if this media is not seekable.
--- a/dom/media/MediaFormatReader.h
+++ b/dom/media/MediaFormatReader.h
@@ -549,16 +549,19 @@ private:
 
   void OnFirstDemuxCompleted(TrackInfo::TrackType aType,
                              RefPtr<MediaTrackDemuxer::SamplesHolder> aSamples);
 
   void OnFirstDemuxFailed(TrackInfo::TrackType aType, const MediaResult& aError);
 
   void MaybeResolveMetadataPromise();
 
+  // Stores presentation info required for playback.
+  MediaInfo mInfo;
+
   UniquePtr<MetadataTags> mTags;
 
   // A flag indicating if the start time is known or not.
   bool mHasStartTime = false;
 
   void ShutdownDecoder(TrackType aTrack);
   RefPtr<ShutdownPromise> TearDownDecoders();
 };