Backed out changeset d7a32460bb32
authorMatthew Gregan <kinetik@flim.org>
Fri, 26 Feb 2010 15:09:46 -0800
changeset 38767 1f8d93376db0184870667af70b1b8b85009229e3
parent 38764 d7a32460bb32036be124cf002d8a44e01e26c124
child 38770 32c9e45bdf374e28ed015e93b24fbfed0c13eb10
push idunknown
push userunknown
push dateunknown
milestone1.9.3a2pre
backs outd7a32460bb32036be124cf002d8a44e01e26c124
Backed out changeset d7a32460bb32
content/media/ogg/nsOggDecoder.cpp
--- a/content/media/ogg/nsOggDecoder.cpp
+++ b/content/media/ogg/nsOggDecoder.cpp
@@ -931,22 +931,16 @@ void nsOggDecodeStateMachine::PlayFrame(
         // Even if the frame has had its audio data written we call
         // PlayAudio to ensure that any data we have buffered in the
         // nsAudioStream is written to the hardware.
         PlayAudio(frame);
         double hwtime = mAudioStream && hasAudio ? mAudioStream->GetPosition() : -1.0;
         time = hwtime < 0.0 ?
           (TimeStamp::Now() - mPlayStartTime - mPauseDuration).ToSeconds() :
           hwtime;
-        // Resynchronize the system clock against the audio clock.
-        if (hwtime >= 0.0) {
-          mPlayStartTime = TimeStamp::Now();
-          mPlayStartTime -= TimeDuration::FromMilliseconds(hwtime * 1000.0);
-          mPauseDuration = TimeDuration(0);
-        }
         // Is it time for the next frame?  Using an integer here avoids f.p.
         // rounding errors that can cause multiple 0ms waits (Bug 495352)
         PRInt64 wait = PRInt64((frame->mTime - time)*1000);
         if (wait <= 0)
           break;
         mon.Wait(PR_MillisecondsToInterval(wait));
         if (mState == DECODER_STATE_SHUTDOWN)
           return;