Bug 1173248 - Remove the workaround introduced to MDSM by bug 951278. r=cpearce.

This commit is contained in:
JW Wang 2015-06-15 10:22:54 +08:00
parent 0fe7e5232d
commit f781334cb2

View File

@ -2970,11 +2970,7 @@ void MediaDecoderStateMachine::AdvanceFrame()
int64_t delta = currentFrame->mTime - clock_time;
TimeStamp presTime = nowTime + TimeDuration::FromMicroseconds(delta / mPlaybackRate);
NS_ASSERTION(currentFrame->mTime >= mStartTime, "Should have positive frame time");
// Filter out invalid frames by checking the frame time. FrameTime could be
// zero if it's a initial frame.
int64_t frameTime = currentFrame->mTime - mStartTime;
if (frameTime > 0 || (frameTime == 0 && mPlayDuration == 0) ||
IsRealTime()) {
{
ReentrantMonitorAutoExit exitMon(mDecoder->GetReentrantMonitor());
// If we have video, we want to increment the clock in steps of the frame
// duration.