Bug 1316211. P6 - move some members from MDR into MFR. draft
authorJW Wang <jwwang@mozilla.com>
Wed, 19 Jul 2017 14:27:24 +0800
changeset 611840 a555c17c703e5c452c20944bd8f64ee6c2f2af83
parent 611839 14af0639acd8db13c1372b5270b42ca0a7458598
child 611841 768fe0da8dfa969f407cce200351149a647ce8d2
push id69302
push userjwwang@mozilla.com
push dateThu, 20 Jul 2017 02:52:36 +0000
bugs1316211
milestone56.0a1
Bug 1316211. P6 - move some members from MDR into MFR. 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();
 };