Backed out changeset 9362521b7f7a (bug 1068970) for mochitest-1 bustage, CLOSED TREE
authorNigel Babu <nigelbabu@gmail.com>
Fri, 19 Sep 2014 10:52:20 +0530
changeset 206136 f1fd44eebac78525a4055757386d54ac7bbf4d70
parent 206135 952adddb379b3717812215fdf0a368221fbf5e22
child 206137 dadafedc076095cec144a8ed98ebe376bd0b9321
child 206192 23400439c1da8dab2478d4f11bac93c2b796235e
push id27513
push usercbook@mozilla.com
push dateFri, 19 Sep 2014 12:15:35 +0000
treeherdermozilla-central@dadafedc0760 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1068970
milestone35.0a1
backs out9362521b7f7a5a938bb09d8f6f6ac96b02a609dc
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 9362521b7f7a (bug 1068970) for mochitest-1 bustage, CLOSED TREE
content/media/MediaDecoderStateMachine.cpp
--- a/content/media/MediaDecoderStateMachine.cpp
+++ b/content/media/MediaDecoderStateMachine.cpp
@@ -295,20 +295,19 @@ void MediaDecoderStateMachine::SendStrea
     // ignore packet that we've already processed
     return;
   }
   aStream->mLastAudioPacketTime = aAudio->mTime;
   aStream->mLastAudioPacketEndTime = aAudio->GetEndTime();
 
   // This logic has to mimic AudioSink closely to make sure we write
   // the exact same silences
-  CheckedInt64 audioWrittenOffset =
-    UsecsToFrames((aStream->mInitialTime + mStartTime) + aStream->mAudioFramesWritten,
-                  mInfo.mAudio.mRate);
-  CheckedInt64 frameOffset = UsecsToFrames(aAudio->mTime, mInfo.mAudio.mRate);
+  CheckedInt64 audioWrittenOffset = UsecsToFrames(mInfo.mAudio.mRate,
+      aStream->mInitialTime + mStartTime) + aStream->mAudioFramesWritten;
+  CheckedInt64 frameOffset = UsecsToFrames(mInfo.mAudio.mRate, aAudio->mTime);
   if (!audioWrittenOffset.isValid() || !frameOffset.isValid())
     return;
   if (audioWrittenOffset.value() < frameOffset.value()) {
     // Write silence to catch up
     VERBOSE_LOG("writing %d frames of silence to MediaStream",
                 int32_t(frameOffset.value() - audioWrittenOffset.value()));
     AudioSegment silence;
     silence.InsertNullDataAtStart(frameOffset.value() - audioWrittenOffset.value());