Bug 1316211. P10 - make SizeOf{Audio,Video}QueueInFrames() pure virtual which will be overridden by MFR. r=gerald
authorJW Wang <jwwang@mozilla.com>
Wed, 19 Jul 2017 15:12:12 +0800
changeset 418809 670f1c2a21307f3808e8bd27a9a3bf639f402a05
parent 418808 3e10f80060f91578aea2d954ef6601fe6f1bafa9
child 418810 60909f8e1e75cdbb99da51cc93eedf724a0b0f40
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. P10 - make SizeOf{Audio,Video}QueueInFrames() pure virtual which will be overridden by MFR. r=gerald MozReview-Commit-ID: 5a4qTXVWdG1
dom/media/MediaDecoderReader.cpp
dom/media/MediaDecoderReader.h
--- a/dom/media/MediaDecoderReader.cpp
+++ b/dom/media/MediaDecoderReader.cpp
@@ -58,26 +58,16 @@ MediaDecoderReader::Init()
 }
 
 MediaDecoderReader::~MediaDecoderReader()
 {
   MOZ_ASSERT(mShutdown);
   MOZ_COUNT_DTOR(MediaDecoderReader);
 }
 
-size_t MediaDecoderReader::SizeOfVideoQueueInFrames()
-{
-  return 0;
-}
-
-size_t MediaDecoderReader::SizeOfAudioQueueInFrames()
-{
-  return 0;
-}
-
 void
 MediaDecoderReader::UpdateDuration(const media::TimeUnit& aDuration)
 {
   MOZ_ASSERT(OnTaskQueue());
   mDuration = Some(aDuration);
   UpdateBuffered();
 }
 
--- a/dom/media/MediaDecoderReader.h
+++ b/dom/media/MediaDecoderReader.h
@@ -190,18 +190,18 @@ public:
   }
 
   // The MediaDecoderStateMachine uses various heuristics that assume that
   // raw media data is arriving sequentially from a network channel. This
   // makes sense in the <video src="foo"> case, but not for more advanced use
   // cases like MSE.
   virtual bool UseBufferingHeuristics() const = 0;
 
-  virtual size_t SizeOfVideoQueueInFrames();
-  virtual size_t SizeOfAudioQueueInFrames();
+  virtual size_t SizeOfVideoQueueInFrames() = 0;
+  virtual size_t SizeOfAudioQueueInFrames() = 0;
 
   // Called once new data has been cached by the MediaResource.
   // mBuffered should be recalculated and updated accordingly.
   virtual void NotifyDataArrived() = 0;
 
   AbstractCanonical<media::TimeIntervals>* CanonicalBuffered()
   {
     return &mBuffered;