Bug 1380568. P2 - remove AbstractMediaDecoder::NotifyDecodedFrames().
MozReview-Commit-ID: AZyPseUiZLl
--- a/dom/media/AbstractMediaDecoder.h
+++ b/dom/media/AbstractMediaDecoder.h
@@ -34,21 +34,16 @@ class GMPCrashHelper;
/**
* The AbstractMediaDecoder class describes the public interface for a media decoder
* and is used by the MediaReader classes.
*/
class AbstractMediaDecoder : public nsIObserver
{
public:
- // Increments the parsed, decoded and dropped frame counters by the passed in
- // counts.
- // Can be called on any thread.
- virtual void NotifyDecodedFrames(const FrameStatisticsData& aStats) = 0;
-
// Return an abstract thread on which to run main thread runnables.
virtual AbstractThread* AbstractMainThread() const = 0;
virtual VideoFrameContainer* GetVideoFrameContainer() = 0;
virtual mozilla::layers::ImageContainer* GetImageContainer() = 0;
// Returns the owner of this decoder or null when the decoder is shutting
// down. The owner should only be used on the main thread.
virtual MediaDecoderOwner* GetOwner() const = 0;
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -417,23 +417,16 @@ private:
// This can be called from any thread. It's only a snapshot of the
// current state, since other threads might be changing the state
// at any time.
MediaStatistics GetStatistics();
// Return the frame decode/paint related statistics.
FrameStatistics& GetFrameStatistics() { return *mFrameStats; }
- // Increments the parsed and decoded frame counters by the passed in counts.
- // Can be called on any thread.
- virtual void NotifyDecodedFrames(const FrameStatisticsData& aStats) override
- {
- GetFrameStatistics().NotifyDecodedFrames(aStats);
- }
-
void UpdateReadyState()
{
MOZ_ASSERT(NS_IsMainThread());
MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
GetOwner()->UpdateReadyState();
}
virtual MediaDecoderOwner::NextFrameStatus NextFrameStatus()
--- a/dom/media/MediaFormatReader.cpp
+++ b/dom/media/MediaFormatReader.cpp
@@ -2516,18 +2516,18 @@ MediaFormatReader::DropDecodedSamples(Tr
auto time = decoder.mOutput.LastElement()->mTime;
if (time >= decoder.mTimeThreshold.ref().Time()) {
// We would have reached our internal seek target.
decoder.mTimeThreshold.reset();
}
}
decoder.mOutput.Clear();
decoder.mSizeOfQueue -= lengthDecodedQueue;
- if (aTrack == TrackInfo::kVideoTrack && mDecoder) {
- mDecoder->NotifyDecodedFrames({ 0, 0, lengthDecodedQueue });
+ if (aTrack == TrackInfo::kVideoTrack && mFrameStats) {
+ mFrameStats->NotifyDecodedFrames({ 0, 0, lengthDecodedQueue });
}
}
void
MediaFormatReader::SkipVideoDemuxToNextKeyFrame(TimeUnit aTimeThreshold)
{
MOZ_ASSERT(OnTaskQueue());
LOG("Skipping up to %" PRId64, aTimeThreshold.ToMicroseconds());
@@ -2549,26 +2549,26 @@ void
MediaFormatReader::VideoSkipReset(uint32_t aSkipped)
{
MOZ_ASSERT(OnTaskQueue());
// Some frames may have been output by the decoder since we initiated the
// videoskip process and we know they would be late.
DropDecodedSamples(TrackInfo::kVideoTrack);
// Report the pending frames as dropped.
- if (mDecoder) {
- mDecoder->NotifyDecodedFrames({ 0, 0, SizeOfVideoQueueInFrames() });
+ if (mFrameStats) {
+ mFrameStats->NotifyDecodedFrames({ 0, 0, SizeOfVideoQueueInFrames() });
}
// Cancel any pending demux request and pending demuxed samples.
mVideo.mDemuxRequest.DisconnectIfExists();
Reset(TrackType::kVideoTrack);
- if (mDecoder) {
- mDecoder->NotifyDecodedFrames({ aSkipped, 0, aSkipped });
+ if (mFrameStats) {
+ mFrameStats->NotifyDecodedFrames({ aSkipped, 0, aSkipped });
}
mVideo.mNumSamplesSkippedTotal += aSkipped;
}
void
MediaFormatReader::OnVideoSkipCompleted(uint32_t aSkipped)
{
--- a/dom/media/webaudio/BufferDecoder.cpp
+++ b/dom/media/webaudio/BufferDecoder.cpp
@@ -28,22 +28,16 @@ BufferDecoder::~BufferDecoder()
void
BufferDecoder::BeginDecoding(TaskQueue* aTaskQueueIdentity)
{
MOZ_ASSERT(!mTaskQueueIdentity && aTaskQueueIdentity);
mTaskQueueIdentity = aTaskQueueIdentity;
}
-void
-BufferDecoder::NotifyDecodedFrames(const FrameStatisticsData& aStats)
-{
- // ignore
-}
-
VideoFrameContainer*
BufferDecoder::GetVideoFrameContainer()
{
// no video frame
return nullptr;
}
layers::ImageContainer*
--- a/dom/media/webaudio/BufferDecoder.h
+++ b/dom/media/webaudio/BufferDecoder.h
@@ -27,18 +27,16 @@ public:
explicit BufferDecoder(MediaResource* aResource,
AbstractThread* aMainThread);
NS_DECL_THREADSAFE_ISUPPORTS
// This has to be called before decoding begins
void BeginDecoding(TaskQueue* aTaskQueueIdentity);
- void NotifyDecodedFrames(const FrameStatisticsData& aStats) final override;
-
VideoFrameContainer* GetVideoFrameContainer() final override;
layers::ImageContainer* GetImageContainer() final override;
MediaDecoderOwner* GetOwner() const final override;
AbstractThread* AbstractMainThread() const final override;
private: