Bug 1161901 - Relax assertion. r=jww
authorBobby Holley <bobbyholley@gmail.com>
Wed, 06 May 2015 22:46:59 -0700
changeset 242791 6f05b1eb33ab1ddec478b4756372bd5cc96f2313
parent 242790 f31c310ad85a75fad8b4c9dff7cb5391fbfd3940
child 242792 6777dea98c1fd7231584b22a17b9758cfefb9691
push id59507
push userbobbyholley@gmail.com
push dateThu, 07 May 2015 16:53:25 +0000
treeherdermozilla-inbound@fa9d94918e12 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjww
bugs1161901
milestone40.0a1
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
Bug 1161901 - Relax assertion. r=jww
dom/media/MediaDecoderStateMachine.cpp
--- a/dom/media/MediaDecoderStateMachine.cpp
+++ b/dom/media/MediaDecoderStateMachine.cpp
@@ -2897,21 +2897,19 @@ int64_t MediaDecoderStateMachine::GetClo
       clock_time = mStartTime + mDecoder->GetDecodedStream()->GetClock();
     } else if (HasAudio() && !mAudioCompleted) {
       clock_time = GetAudioClock();
     } else {
       // Audio is disabled on this system. Sync to the system clock.
       clock_time = GetVideoStreamPosition();
     }
     // Ensure the clock can never go backwards.
-    // Note we allow clock going backwards in capture mode during seeking.
-    NS_ASSERTION(GetMediaTime() <= clock_time ||
-                 mPlaybackRate <= 0 ||
-                 (mAudioCaptured && mState == DECODER_STATE_SEEKING),
-      "Clock should go forwards.");
+    // Note we allow clock going backwards in capture mode - we should fix this in bug 1162381.
+    NS_ASSERTION(GetMediaTime() <= clock_time || mPlaybackRate <= 0 || mAudioCaptured,
+    "Clock should go forwards.");
   }
 
   return clock_time;
 }
 
 void MediaDecoderStateMachine::AdvanceFrame()
 {
   MOZ_ASSERT(OnTaskQueue());