Bug 1300497. Part 6 - remove the call to |SetState(DECODER_STATE_SHUTDOWN)| from DecodeError().
So we have only one place to transition to the SHUTDOWN state which is Shutdown().
MozReview-Commit-ID: 6MNISCea94Q
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1993,26 +1993,18 @@ bool MediaDecoderStateMachine::HasLowUnd
media::TimeUnit::FromMicroseconds(std::min(endOfDecodedData + aUsecs, Duration().ToMicroseconds())));
return endOfDecodedData != INT64_MAX && !mBuffered.Ref().Contains(interval);
}
void
MediaDecoderStateMachine::DecodeError()
{
MOZ_ASSERT(OnTaskQueue());
-
- if (IsShutdown()) {
- // Already shutdown.
- return;
- }
-
+ MOZ_ASSERT(!IsShutdown());
DECODER_WARN("Decode error");
- // Change state to SHUTDOWN so we have no more processing.
- SetState(DECODER_STATE_SHUTDOWN);
-
// Notify the decode error and MediaDecoder will shut down MDSM.
mOnPlaybackEvent.Notify(MediaEventType::DecodeError);
}
void
MediaDecoderStateMachine::OnMetadataRead(MetadataHolder* aMetadata)
{
MOZ_ASSERT(OnTaskQueue());