Bug 1431221 - P12. Fix Force Stereo Mode. r=padenot draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Thu, 01 Feb 2018 15:59:21 +0100
changeset 771694 26a99d7fa047f65b696db0b8e5e3bf6a0b05206c
parent 771693 4fbcdc69f42a66bd9f988cfb7837f61c1bc73c7f
child 771695 20e077bf24bc02c3c7d8fcb4201cf0982a75b3c3
push id103752
push userbmo:jyavenard@mozilla.com
push dateFri, 23 Mar 2018 17:52:32 +0000
reviewerspadenot
bugs1431221
milestone61.0a1
Bug 1431221 - P12. Fix Force Stereo Mode. r=padenot MozReview-Commit-ID: DEoKXNk3d4E
dom/media/AudioConverter.cpp
--- a/dom/media/AudioConverter.cpp
+++ b/dom/media/AudioConverter.cpp
@@ -141,17 +141,18 @@ static inline int16_t clipTo15(int32_t a
 }
 
 size_t
 AudioConverter::DownmixAudio(void* aOut, const void* aIn, size_t aFrames) const
 {
   MOZ_ASSERT(mIn.Format() == AudioConfig::FORMAT_S16 ||
              mIn.Format() == AudioConfig::FORMAT_FLT);
   MOZ_ASSERT(mIn.Channels() >= mOut.Channels());
-  MOZ_ASSERT(mIn.Layout() == AudioConfig::ChannelLayout(mIn.Channels()),
+  MOZ_ASSERT(mIn.Layout() ==
+             AudioConfig::ChannelLayout::SMPTEDefault(mIn.Layout()),
              "Can only downmix input data in SMPTE layout");
   MOZ_ASSERT(mOut.Layout() == AudioConfig::ChannelLayout(2) ||
              mOut.Layout() == AudioConfig::ChannelLayout(1));
 
   uint32_t channels = mIn.Channels();
 
   if (channels == 1 && mOut.Channels() == 1) {
     if (aOut != aIn) {