Bug 1431221 - P7. Pass channel layout on mac. r=padenot draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Mon, 22 Jan 2018 21:46:22 +0100
changeset 771689 eddbd1f0c6e97794a1ce071ff21bf4c528a9b461
parent 771688 441a36597cfe66581dd4d68ca2554345ab1338c0
child 771690 c040f7a95bd19e15f1e3066ed405a87b8c9265f1
push id103752
push userbmo:jyavenard@mozilla.com
push dateFri, 23 Mar 2018 17:52:32 +0000
reviewerspadenot
bugs1431221
milestone61.0a1
Bug 1431221 - P7. Pass channel layout on mac. r=padenot
dom/media/platforms/apple/AppleATDecoder.cpp
--- a/dom/media/platforms/apple/AppleATDecoder.cpp
+++ b/dom/media/platforms/apple/AppleATDecoder.cpp
@@ -322,23 +322,26 @@ AppleATDecoder::DecodeSample(MediaRawDat
     }
     mAudioConverter = MakeUnique<AudioConverter>(in, out);
   }
   if (mAudioConverter) {
     MOZ_ASSERT(mAudioConverter->CanWorkInPlace());
     data = mAudioConverter->Process(Move(data));
   }
 
-  RefPtr<AudioData> audio = new AudioData(aSample->mOffset,
-                                          aSample->mTime,
-                                          duration,
-                                          numFrames,
-                                          data.Forget(),
-                                          channels,
-                                          rate);
+  RefPtr<AudioData> audio =
+    new AudioData(aSample->mOffset,
+                  aSample->mTime,
+                  duration,
+                  numFrames,
+                  data.Forget(),
+                  channels,
+                  rate,
+                  mChannelLayout ? mChannelLayout->Map()
+                                 : AudioConfig::ChannelLayout::UNKNOWN_MAP);
   mDecodedSamples.AppendElement(Move(audio));
   return NS_OK;
 }
 
 MediaResult
 AppleATDecoder::GetInputAudioDescription(AudioStreamBasicDescription& aDesc,
                                          const nsTArray<uint8_t>& aExtraData)
 {