Bug 1378085 p6 - override HandleAudioWaited(); r?jwwang
MozReview-Commit-ID: GKXQVAYm0lz
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1149,20 +1149,16 @@ public:
MaybeFinishSeek();
}
void HandleAudioWaited(MediaData::Type aType) override
{
MOZ_ASSERT(!mDoneAudioSeeking || !mDoneVideoSeeking,
"Seek shouldn't be finished");
- // Ignore pending requests from video-only seek.
- if (mSeekJob.mTarget->IsVideoOnly()) {
- return;
- }
RequestAudioData();
}
void HandleVideoWaited(MediaData::Type aType) override
{
MOZ_ASSERT(!mDoneAudioSeeking || !mDoneVideoSeeking,
"Seek shouldn't be finished");
@@ -1786,16 +1782,24 @@ public:
mMaster->PushAudio(aAudio);
}
void HandleWaitingForAudio() override { }
void HandleAudioCanceled() override { }
void HandleEndOfAudio() override { }
+
+ void HandleAudioWaited(MediaData::Type aType) override
+ {
+ MOZ_ASSERT(!mDoneAudioSeeking || !mDoneVideoSeeking,
+ "Seek shouldn't be finished");
+
+ // Ignore pending requests from video-only seek.
+ }
};
RefPtr<MediaDecoder::SeekPromise>
MediaDecoderStateMachine::DormantState::HandleSeek(SeekTarget aTarget)
{
if (aTarget.IsNextFrame()) {
// NextFrameSeekingState doesn't reset the decoder unlike
// AccurateSeekingState. So we first must come out of dormant by seeking to