Bug 1172826 - remove unnecessary checks for MediaDecoderStateMachine::mPlaybackRate. r=kinetik.

This commit is contained in:
JW Wang 2015-06-17 10:31:05 +08:00
parent 595dac4152
commit f9dc179928

View File

@ -2608,8 +2608,8 @@ nsresult MediaDecoderStateMachine::RunStateMachine()
AdvanceFrame();
NS_ASSERTION(!IsPlaying() ||
mLogicallySeeking ||
IsStateMachineScheduled() ||
mPlaybackRate == 0.0, "Must have timer scheduled");
IsStateMachineScheduled(),
"Must have timer scheduled");
return NS_OK;
}
@ -2682,7 +2682,7 @@ nsresult MediaDecoderStateMachine::RunStateMachine()
AdvanceFrame();
NS_ASSERTION(!IsPlaying() ||
mLogicallySeeking ||
mPlaybackRate == 0 || IsStateMachineScheduled(),
IsStateMachineScheduled(),
"Must have timer scheduled");
return NS_OK;
}
@ -2874,8 +2874,7 @@ int64_t MediaDecoderStateMachine::GetClock() const
// Audio is disabled on this system. Sync to the system clock.
clock_time = GetVideoStreamPosition();
}
NS_ASSERTION(GetMediaTime() <= clock_time || mPlaybackRate <= 0,
"Clock should go forwards.");
NS_ASSERTION(GetMediaTime() <= clock_time, "Clock should go forwards.");
}
return clock_time;
@ -2892,12 +2891,6 @@ void MediaDecoderStateMachine::AdvanceFrame()
return;
}
// If playbackRate is 0.0, we should stop the progress, but not be in paused
// state, per spec.
if (mPlaybackRate == 0.0) {
return;
}
if (mAudioCaptured) {
SendStreamData();
}