Bug 1444479 - P5. Let AudioSink deal with unknown layout. r?padenot
MozReview-Commit-ID: F31zNl5o9n1
--- 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);