Bug 1300956. Part 2 - Implement WaitForCDMState. draft
authorJW Wang <jwwang@mozilla.com>
Tue, 06 Sep 2016 11:05:03 +0800
changeset 411521 aeb66600ae0c3d39e7b8ff257771a5b14fb16026
parent 411520 3b3dafc50923ecccc72df5a5186e7d2e1cc7a712
child 411522 d76c84b7264ac7ee3c2199614bdb4e7d95a2d7a1
push id28915
push userjwwang@mozilla.com
push dateThu, 08 Sep 2016 07:23:46 +0000
bugs1300956
milestone51.0a1
Bug 1300956. Part 2 - Implement WaitForCDMState. MozReview-Commit-ID: 7jzwgWxqYKL
dom/media/MediaDecoderStateMachine.cpp
--- 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();
 }