Bug 1316211. P10 - make SizeOf{Audio,Video}QueueInFrames() pure virtual which will be overridden by MFR.
MozReview-Commit-ID: 5a4qTXVWdG1
--- 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;