Bug 1444479 - P5. Let AudioSink deal with unknown layout. r?padenot draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Fri, 16 Mar 2018 16:49:55 +0100
changeset 769398 82589900face8537d3912e3aa792088cc37eb4ce
parent 769397 fa1757b52422b7210826ecf33b5730420475d41e
child 769399 3e58f138c164179245e47e3f15f7d9750c521e67
push id103110
push userbmo:jyavenard@mozilla.com
push dateMon, 19 Mar 2018 14:36:56 +0000
reviewerspadenot
bugs1444479
milestone61.0a1
Bug 1444479 - P5. Let AudioSink deal with unknown layout. r?padenot MozReview-Commit-ID: F31zNl5o9n1
dom/media/mediasink/AudioSink.cpp
--- a/dom/media/mediasink/AudioSink.cpp
+++ b/dom/media/mediasink/AudioSink.cpp
@@ -398,19 +398,19 @@ AudioSink::NotifyAudioNeeded()
       const AudioConfig::ChannelLayout inputLayout =
         data->mChannelMap
           ? AudioConfig::ChannelLayout::SMPTEDefault(data->mChannelMap)
           : AudioConfig::ChannelLayout(data->mChannels);
       const AudioConfig::ChannelLayout outputLayout =
         mOutputChannels == data->mChannels
           ? inputLayout
           : AudioConfig::ChannelLayout(mOutputChannels);
-      mConverter =
-        MakeUnique<AudioConverter>(AudioConfig(inputLayout, data->mRate),
-                                   AudioConfig(outputLayout, mOutputRate));
+      mConverter = MakeUnique<AudioConverter>(
+        AudioConfig(inputLayout, data->mChannels, data->mRate),
+        AudioConfig(outputLayout, mOutputChannels, mOutputRate));
     }
 
     // See if there's a gap in the audio. If there is, push silence into the
     // audio hardware, so we can play across the gap.
     // Calculate the timestamp of the next chunk of audio in numbers of
     // samples.
     CheckedInt64 sampleTime =
       TimeUnitToFrames(data->mTime - mStartTime, data->mRate);