Bug 525401 - Fix resuming from pause when playing poorly muxed videos. r=chris.double

content/media/ogg/nsOggDecoder.cpp

@@ -1084,9 +1084,6 @@ void nsOggDecodeStateMachine::StartPlayback()
     // Null out mPauseStartTime
     mPauseStartTime = TimeStamp();
   }
-  mPlayStartTime = TimeStamp::Now();
-  mPauseDuration = 0;
-
 }
 
 void nsOggDecodeStateMachine::StopPlayback()
@@ -1095,7 +1092,9 @@ void nsOggDecodeStateMachine::StopPlayback()
   mLastFrame = mDecodedFrames.ResetTimes(mCallbackPeriod);
   StopAudio();
   mPlaying = PR_FALSE;
-  mPauseStartTime = TimeStamp::Now();
+  mPauseStartTime = TimeStamp();
+  mPauseDuration = 0;
+  mPlayStartTime = TimeStamp();
 }
 
 void nsOggDecodeStateMachine::PausePlayback()
@@ -1107,9 +1106,6 @@ void nsOggDecodeStateMachine::PausePlayback()
   mAudioStream->Pause();
   mPlaying = PR_FALSE;
   mPauseStartTime = TimeStamp::Now();
-  if (mAudioStream->GetPosition() < 0) {
-    mLastFrame = mDecodedFrames.ResetTimes(mCallbackPeriod);
-  }
 }
 
 void nsOggDecodeStateMachine::ResumePlayback()
@@ -1128,8 +1124,6 @@ void nsOggDecodeStateMachine::ResumePlayback()
    // Null out mPauseStartTime
    mPauseStartTime = TimeStamp();
  }
- mPlayStartTime = TimeStamp::Now();
- mPauseDuration = 0;
 }
 
 void nsOggDecodeStateMachine::UpdatePlaybackPosition(float aTime)
@@ -1509,6 +1503,9 @@ nsresult nsOggDecodeStateMachine::Run()
         QueueDecodedFrames();
         while (mDecodedFrames.IsEmpty() && !mDecodingCompleted &&
                !mBufferExhausted) {
+          if (mPlaying) {
+            PausePlayback();
+          }
           mon.Wait(PR_MillisecondsToInterval(PRInt64(mCallbackPeriod*500)));
           if (mState != DECODER_STATE_DECODING)
             break;