Bug 1300956. Part 2 - Implement WaitForCDMState.
MozReview-Commit-ID: 7jzwgWxqYKL
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -234,16 +234,28 @@ public:
}
State GetState() const override
{
return DECODER_STATE_DECODING_METADATA;
}
};
+class MediaDecoderStateMachine::WaitForCDMState
+ : public MediaDecoderStateMachine::StateObject
+{
+public:
+ explicit WaitForCDMState(Master* aPtr) : StateObject(aPtr) {}
+
+ State GetState() const override
+ {
+ return DECODER_STATE_WAIT_FOR_CDM;
+ }
+};
+
#define INIT_WATCHABLE(name, val) \
name(val, "MediaDecoderStateMachine::" #name)
#define INIT_MIRROR(name, val) \
name(mTaskQueue, val, "MediaDecoderStateMachine::" #name " (Mirror)")
#define INIT_CANONICAL(name, val) \
name(mTaskQueue, val, "MediaDecoderStateMachine::" #name " (Canonical)")
MediaDecoderStateMachine::MediaDecoderStateMachine(MediaDecoder* aDecoder,
@@ -1101,16 +1113,19 @@ MediaDecoderStateMachine::SetState(State
ExitState();
mState = aState;
switch (mState) {
case DECODER_STATE_DECODING_METADATA:
mStateObj = MakeUnique<DecodeMetadataState>(this);
break;
+ case DECODER_STATE_WAIT_FOR_CDM:
+ mStateObj = MakeUnique<WaitForCDMState>(this);
+ break;
default:
mStateObj = nullptr;
break;
}
EnterState();
}