Bug 1395195 - Restrict min number of channels on AudioCallbackDriver's helper buffers. r?padenot draft
authorAlex Chronopoulos <achronop@gmail.com>
Thu, 31 Aug 2017 16:43:01 +0300
changeset 656674 f9eac51ae3df2c4da006ac09fe9a9f73ff01ea3c
parent 654592 1b4c59eef820b46eb0037aca68f83a15088db45f
child 729203 90418092fd789610826e770440be34ac037ad4ed
push id77281
push userachronop@gmail.com
push dateThu, 31 Aug 2017 13:40:27 +0000
reviewerspadenot
bugs1395195
milestone57.0a1
Bug 1395195 - Restrict min number of channels on AudioCallbackDriver's helper buffers. r?padenot MozReview-Commit-ID: 5eAhN4x6U4q
dom/media/GraphDriver.cpp
--- a/dom/media/GraphDriver.cpp
+++ b/dom/media/GraphDriver.cpp
@@ -556,18 +556,18 @@ StreamAndPromiseForOperation::StreamAndP
   , mOperation(aOperation)
 {
   // MOZ_ASSERT(aPromise);
 }
 
 AudioCallbackDriver::AudioCallbackDriver(MediaStreamGraphImpl* aGraphImpl)
   : GraphDriver(aGraphImpl)
   , mOuputChannels(mGraphImpl->AudioChannelCount())
-  , mScratchBuffer(mOuputChannels)
-  , mBuffer(mOuputChannels)
+  , mScratchBuffer(std::max<uint32_t>(1, mOuputChannels))
+  , mBuffer(std::max<uint32_t>(1, mOuputChannels))
   , mSampleRate(0)
   , mInputChannels(1)
   , mIterationDurationMS(MEDIA_GRAPH_TARGET_PERIOD_MS)
   , mStarted(false)
   , mAudioInput(nullptr)
   , mAddedMixer(false)
   , mInCallback(false)
   , mMicrophoneActive(false)