Bug 1123535 - Make dormant ResetPlayback assertion more lenient. r=me a=KWierso on a CLOSED TREE
authorChris Pearce <cpearce@mozilla.com>
Tue, 03 Feb 2015 14:20:24 +1300
changeset 243656 f74e583e724f
parent 243655 41fac15f269a
child 243661 e0a36c5bdf4c
push id4424
push usercpearce@mozilla.com
push date2015-02-03 01:21 +0000
treeherdermozilla-beta@f74e583e724f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersme, KWierso
bugs1123535
milestone36.0
Bug 1123535 - Make dormant ResetPlayback assertion more lenient. r=me a=KWierso on a CLOSED TREE
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -1623,17 +1623,18 @@ void MediaDecoderStateMachine::Play()
   ScheduleStateMachine();
 }
 
 void MediaDecoderStateMachine::ResetPlayback()
 {
   AssertCurrentThreadInMonitor();
   MOZ_ASSERT(mState == DECODER_STATE_SEEKING ||
              mState == DECODER_STATE_SHUTDOWN ||
-             mState == DECODER_STATE_DORMANT);
+             mState == DECODER_STATE_DORMANT ||
+             mState == DECODER_STATE_DECODING_NONE);
 
   // Audio thread should've been stopped at the moment. Otherwise, AudioSink
   // might be accessing AudioQueue outside of the decoder monitor while we
   // are clearing the queue and causes crash for no samples to be popped.
   MOZ_ASSERT(!mAudioSink);
 
   mVideoFrameEndTime = -1;
   mDecodedVideoEndTime = -1;