author | Sebastian Hengst <archaeopteryx@coole-files.de> |
Tue, 06 Sep 2016 19:06:51 +0200 | |
changeset 312838 | 1d3be125b16a2c6efcdb11b7d4a44f9aebc63241 |
parent 312837 | 5a61f9f8334b054392c6431fec50ec78c11e7194 |
child 312839 | 73a38f53b9b0e04185335971aeacc4335d53370f |
push id | 30661 |
push user | kwierso@gmail.com |
push date | Wed, 07 Sep 2016 00:28:11 +0000 |
treeherder | mozilla-central@3ba67e3bb588 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
bugs | 1286041 |
milestone | 51.0a1 |
backs out | bb04b5569ab96f761384ca2b6d7206aa2daac416 |
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
|
--- a/dom/media/AudioStream.cpp +++ b/dom/media/AudioStream.cpp @@ -591,18 +591,17 @@ 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 || - !strcmp(cubeb_get_backend_id(CubebUtils::GetCubebContext()), "winmm")); + MOZ_ASSERT(mState != INITIALIZED); // NOTE: wasapi (others?) can call us back *after* stop()/Shutdown() (mState == SHUTDOWN) // Bug 996162 if (mAudioClock.GetInputRate() == mAudioClock.GetOutputRate()) { GetUnprocessed(writer); } else { GetTimeStretched(writer);