Bug 1267637: [wmf] P9. Reject audio data with unsupported channel configuration. r?gerald draft
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 27 Apr 2016 17:56:45 +1000
changeset 356839 95ff77b0e1066bc3ff2823ce4365dd0a984ff338
parent 356838 504397ea04849284d1fa3889557c7666a64c7326
child 519494 a41b9207ce415f39e2a9e9ea6e34cc088c8b603c
push id16612
push userbmo:jyavenard@mozilla.com
push dateWed, 27 Apr 2016 08:16:14 +0000
reviewersgerald
bugs1267637
milestone49.0a1
Bug 1267637: [wmf] P9. Reject audio data with unsupported channel configuration. r?gerald MozReview-Commit-ID: BJQXojV4SZZ
dom/media/platforms/wmf/WMFAudioMFTManager.cpp
--- a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp
+++ b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp
@@ -190,16 +190,21 @@ WMFAudioMFTManager::UpdateOutputType()
   NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
 
   hr = type->GetUINT32(MF_MT_AUDIO_SAMPLES_PER_SECOND, &mAudioRate);
   NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
 
   hr = type->GetUINT32(MF_MT_AUDIO_NUM_CHANNELS, &mAudioChannels);
   NS_ENSURE_TRUE(SUCCEEDED(hr), hr);
 
+  AudioConfig::ChannelLayout layout(mAudioChannels);
+  if (!layout.IsValid()) {
+    return E_FAIL;
+  }
+
   return S_OK;
 }
 
 HRESULT
 WMFAudioMFTManager::Output(int64_t aStreamOffset,
                            RefPtr<MediaData>& aOutData)
 {
   aOutData = nullptr;