Bug 1314526. Part 3 - fix HandleVideoDecoded()
MozReview-Commit-ID: 3d3FFCupF3a
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -190,21 +190,17 @@ public:
virtual ~StateObject() {}
virtual void Exit() {}; // Exit action.
virtual void Step() {} // Perform a 'cycle' of this state object.
virtual State GetState() const = 0;
// Event handlers for various events.
virtual void HandleCDMProxyReady() {}
virtual void HandleAudioDecoded(MediaData* aAudio) {}
-
- virtual bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart)
- {
- return false;
- }
+ virtual void HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) {}
virtual bool HandleEndOfStream() { return false; }
virtual bool HandleWaitingForData() { return false; }
virtual RefPtr<MediaDecoder::SeekPromise> HandleSeek(SeekTarget aTarget) = 0;
virtual bool HandleAudioCaptured() { return false; }
@@ -479,21 +475,20 @@ public:
}
void HandleAudioDecoded(MediaData* aAudio) override
{
mMaster->Push(aAudio, MediaData::AUDIO_DATA);
MaybeFinishDecodeFirstFrame();
}
- bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
+ void HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
{
mMaster->Push(aVideo, MediaData::VIDEO_DATA);
MaybeFinishDecodeFirstFrame();
- return true;
}
bool HandleEndOfStream() override
{
MaybeFinishDecodeFirstFrame();
return true;
}
@@ -578,22 +573,21 @@ public:
}
void HandleAudioDecoded(MediaData* aAudio) override
{
mMaster->Push(aAudio, MediaData::AUDIO_DATA);
MaybeStopPrerolling();
}
- bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
+ void HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
{
mMaster->Push(aVideo, MediaData::VIDEO_DATA);
MaybeStopPrerolling();
CheckSlowDecoding(aDecodeStart);
- return true;
}
RefPtr<MediaDecoder::SeekPromise> HandleSeek(SeekTarget aTarget) override;
bool HandleEndOfStream() override;
bool HandleWaitingForData() override
{
@@ -850,20 +844,19 @@ public:
return DECODER_STATE_SEEKING;
}
void HandleAudioDecoded(MediaData* aAudio) override
{
MOZ_ASSERT(false);
}
- bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
+ void HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
{
MOZ_ASSERT(false);
- return true;
}
RefPtr<MediaDecoder::SeekPromise> HandleSeek(SeekTarget aTarget) override;
void HandleVideoSuspendTimeout() override
{
// Do nothing since we want a valid video frame to show when seek is done.
}
@@ -965,23 +958,22 @@ public:
void HandleAudioDecoded(MediaData* aAudio) override
{
// This might be the sample we need to exit buffering.
// Schedule Step() to check it.
mMaster->Push(aAudio, MediaData::AUDIO_DATA);
mMaster->ScheduleStateMachine();
}
- bool HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
+ void HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) override
{
// This might be the sample we need to exit buffering.
// Schedule Step() to check it.
mMaster->Push(aVideo, MediaData::VIDEO_DATA);
mMaster->ScheduleStateMachine();
- return true;
}
bool HandleEndOfStream() override;
RefPtr<MediaDecoder::SeekPromise> HandleSeek(SeekTarget aTarget) override;
void HandleVideoSuspendTimeout() override
{