Bug 1325905. Part 7 - add assertions to ensure Ensure{Audio,Video}DecodeTaskQueued is never called by DecodingFirstFrameState.
MozReview-Commit-ID: 9zSuH4p0aqg
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -3012,22 +3012,22 @@ MediaDecoderStateMachine::DispatchAudioD
}
}
void
MediaDecoderStateMachine::EnsureAudioDecodeTaskQueued()
{
MOZ_ASSERT(OnTaskQueue());
MOZ_ASSERT(mState != DECODER_STATE_SEEKING);
+ MOZ_ASSERT(mState != DECODER_STATE_DECODING_FIRSTFRAME);
SAMPLE_LOG("EnsureAudioDecodeTaskQueued isDecoding=%d status=%s",
IsAudioDecoding(), AudioRequestStatus());
if (mState != DECODER_STATE_DECODING &&
- mState != DECODER_STATE_DECODING_FIRSTFRAME &&
mState != DECODER_STATE_BUFFERING) {
return;
}
if (!IsAudioDecoding() ||
IsRequestingAudioData() ||
IsWaitingAudioData()) {
return;
@@ -3074,22 +3074,22 @@ MediaDecoderStateMachine::DispatchVideoD
}
}
void
MediaDecoderStateMachine::EnsureVideoDecodeTaskQueued()
{
MOZ_ASSERT(OnTaskQueue());
MOZ_ASSERT(mState != DECODER_STATE_SEEKING);
+ MOZ_ASSERT(mState != DECODER_STATE_DECODING_FIRSTFRAME);
SAMPLE_LOG("EnsureVideoDecodeTaskQueued isDecoding=%d status=%s",
IsVideoDecoding(), VideoRequestStatus());
if (mState != DECODER_STATE_DECODING &&
- mState != DECODER_STATE_DECODING_FIRSTFRAME &&
mState != DECODER_STATE_BUFFERING) {
return;
}
if (!IsVideoDecoding() ||
IsRequestingVideoData() ||
IsWaitingVideoData()) {
return;