Bug 1286041 - Disable an assert when using winmm, on a CLOSED TREE. r=achronop
☠☠ backed out by 1d3be125b16a ☠ ☠
authorPaul Adenot <paul@paul.cx>
Tue, 06 Sep 2016 15:34:57 +0200
changeset 354117 bb04b5569ab96f761384ca2b6d7206aa2daac416
parent 354116 72136b9b75329a08c5b209b412ffc5b5779e902f
child 354118 cbaece1227e69e8b7bf7192cc36390a17aa41587
push id6570
push userraliiev@mozilla.com
push dateMon, 14 Nov 2016 12:26:13 +0000
treeherdermozilla-beta@f455459b2ae5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersachronop
bugs1286041
milestone51.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 1286041 - Disable an assert when using winmm, on a CLOSED TREE. r=achronop MozReview-Commit-ID: HHWIDARNPft
dom/media/AudioStream.cpp
--- a/dom/media/AudioStream.cpp
+++ b/dom/media/AudioStream.cpp
@@ -591,17 +591,18 @@ long
 AudioStream::DataCallback(void* aBuffer, long aFrames)
 {
   MonitorAutoLock mon(mMonitor);
   MOZ_ASSERT(mState != SHUTDOWN, "No data callback after shutdown");
 
   auto writer = AudioBufferWriter(
     reinterpret_cast<AudioDataValue*>(aBuffer), mOutChannels, aFrames);
 
-  MOZ_ASSERT(mState != INITIALIZED);
+  MOZ_ASSERT(mState != INITIALIZED ||
+             !strcmp(cubeb_get_backend_id(CubebUtils::GetCubebContext()), "winmm"));
 
   // NOTE: wasapi (others?) can call us back *after* stop()/Shutdown() (mState == SHUTDOWN)
   // Bug 996162
 
   if (mAudioClock.GetInputRate() == mAudioClock.GetOutputRate()) {
     GetUnprocessed(writer);
   } else {
     GetTimeStretched(writer);