Bug 1189506. Relax assertions a bit. karlt
authorRobert O'Callahan <robert@ocallahan.org>
Tue, 08 Sep 2015 17:14:43 +1200
changeset 295526 a4bfb4017c00886fed3bb7e52e1afb5afedba8f7
parent 295525 1c0b08207de93d30676d49264509e8096cc7d5d7
child 295527 133b52029897d9935a8ffb857438504c467e5bf7
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1189506
milestone43.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 1189506. Relax assertions a bit. karlt
dom/media/MediaStreamGraph.cpp
--- a/dom/media/MediaStreamGraph.cpp
+++ b/dom/media/MediaStreamGraph.cpp
@@ -1683,26 +1683,28 @@ MediaStream::SetGraphImpl(MediaStreamGra
 {
   MediaStreamGraphImpl* graph = static_cast<MediaStreamGraphImpl*>(aGraph);
   SetGraphImpl(graph);
 }
 
 StreamTime
 MediaStream::GraphTimeToStreamTime(GraphTime aTime)
 {
-  NS_ASSERTION(mStartBlocking == GraphImpl()->mStateComputedTime,
-               "Don't call this when there's pending blocking time!");
+  NS_ASSERTION(mStartBlocking == GraphImpl()->mStateComputedTime ||
+               aTime <= mStartBlocking,
+               "Incorrectly ignoring blocking!");
   return aTime - mBufferStartTime;
 }
 
 GraphTime
 MediaStream::StreamTimeToGraphTime(StreamTime aTime)
 {
-  NS_ASSERTION(mStartBlocking == GraphImpl()->mStateComputedTime,
-               "Don't call this when there's pending blocking time!");
+  NS_ASSERTION(mStartBlocking == GraphImpl()->mStateComputedTime ||
+               aTime + mBufferStartTime <= mStartBlocking,
+               "Incorrectly ignoring blocking!");
   return aTime + mBufferStartTime;
 }
 
 StreamTime
 MediaStream::GraphTimeToStreamTimeWithBlocking(GraphTime aTime)
 {
   return GraphImpl()->GraphTimeToStreamTimeWithBlocking(this, aTime);
 }