Bug 1314526. Part 6 - fix HandleAudioCaptured().
MozReview-Commit-ID: L8z35AVdU8Y
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -193,21 +193,20 @@ public:
virtual State GetState() const = 0;
// Event handlers for various events.
virtual void HandleCDMProxyReady() {}
virtual void HandleAudioDecoded(MediaData* aAudio) {}
virtual void HandleVideoDecoded(MediaData* aVideo, TimeStamp aDecodeStart) {}
virtual void HandleEndOfStream() {}
virtual void HandleWaitingForData() {}
+ virtual void HandleAudioCaptured() {}
virtual RefPtr<MediaDecoder::SeekPromise> HandleSeek(SeekTarget aTarget) = 0;
- virtual bool HandleAudioCaptured() { return false; }
-
virtual RefPtr<ShutdownPromise> HandleShutdown();
virtual void HandleVideoSuspendTimeout() = 0;
virtual void HandleResumeVideoDecoding();
virtual void HandlePlayStateChanged(MediaDecoder::PlayState aPlayState) {}
@@ -586,22 +585,21 @@ public:
void HandleEndOfStream() override;
void HandleWaitingForData() override
{
MaybeStopPrerolling();
}
- bool HandleAudioCaptured() override
+ void HandleAudioCaptured() override
{
MaybeStopPrerolling();
// MediaSink is changed. Schedule Step() to check if we can start playback.
mMaster->ScheduleStateMachine();
- return true;
}
void HandleVideoSuspendTimeout() override
{
if (mMaster->HasVideo()) {
mMaster->mVideoDecodeSuspended = true;
mMaster->mOnPlaybackEvent.Notify(MediaEventType::EnterVideoSuspend);
Reader()->SetVideoBlankDecode(true);
@@ -1058,21 +1056,20 @@ public:
State GetState() const override
{
return DECODER_STATE_COMPLETED;
}
RefPtr<MediaDecoder::SeekPromise> HandleSeek(SeekTarget aTarget) override;
- bool HandleAudioCaptured() override
+ void HandleAudioCaptured() override
{
// MediaSink is changed. Schedule Step() to check if we can start playback.
mMaster->ScheduleStateMachine();
- return true;
}
void HandleVideoSuspendTimeout() override
{
// Do nothing since no decoding is going on.
}
void HandlePlayStateChanged(MediaDecoder::PlayState aPlayState) override