diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-04-04 17:33:15 +0200 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-04 17:33:15 +0200 |
| commit | 757a30f720cc4ae3e317594ff4249bc3fd9496ed (patch) | |
| tree | f3299a64a8db431faf6f534ea950027c9de3a245 /dom/media/platforms/wmf | |
| parent | ba4eba034f726bbafe1fea841b2613d4e37e6cad (diff) | |
| download | uxp-757a30f720cc4ae3e317594ff4249bc3fd9496ed.tar.gz | |
Revert "Issue #1806 - Part 2: Adjust the platform for lib changes"
This reverts commit 3635039d2be6264673f3b89b8df390f03159fcaa.
Diffstat (limited to 'dom/media/platforms/wmf')
| -rw-r--r-- | dom/media/platforms/wmf/WMFAudioMFTManager.cpp | 13 | ||||
| -rw-r--r-- | dom/media/platforms/wmf/WMFAudioMFTManager.h | 1 |
2 files changed, 1 insertions, 13 deletions
diff --git a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp index ef83dbb05d..4e0c3a8641 100644 --- a/dom/media/platforms/wmf/WMFAudioMFTManager.cpp +++ b/dom/media/platforms/wmf/WMFAudioMFTManager.cpp @@ -82,7 +82,6 @@ AACAudioSpecificConfigToUserData(uint8_t aAACProfileLevelIndication, WMFAudioMFTManager::WMFAudioMFTManager( const AudioInfo& aConfig) : mAudioChannels(aConfig.mChannels) - , mChannelsMap(AudioConfig::ChannelLayout::UNKNOWN_MAP) , mAudioRate(aConfig.mRate) , mAudioFrameSum(0) , mMustRecaptureAudioPosition(true) @@ -211,15 +210,6 @@ WMFAudioMFTManager::UpdateOutputType() hr = type->GetUINT32(MF_MT_AUDIO_NUM_CHANNELS, &mAudioChannels); NS_ENSURE_TRUE(SUCCEEDED(hr), hr); - uint32_t channelsMap; - hr = type->GetUINT32(MF_MT_AUDIO_CHANNEL_MASK, &channelsMap); - if (SUCCEEDED(hr)) { - mChannelsMap = channelsMap; - } else { - LOG("Unable to retrieve channel layout. Ignoring"); - mChannelsMap = AudioConfig::ChannelLayout::UNKNOWN_MAP; - } - AudioConfig::ChannelLayout layout(mAudioChannels); if (!layout.IsValid()) { return E_FAIL; @@ -342,8 +332,7 @@ WMFAudioMFTManager::Output(int64_t aStreamOffset, numFrames, Move(audioData), mAudioChannels, - mAudioRate, - mChannelsMap); + mAudioRate); #ifdef LOG_SAMPLE_DECODE LOG("Decoded audio sample! timestamp=%lld duration=%lld currentLength=%u", diff --git a/dom/media/platforms/wmf/WMFAudioMFTManager.h b/dom/media/platforms/wmf/WMFAudioMFTManager.h index 1f803a0e98..5bbbc6108a 100644 --- a/dom/media/platforms/wmf/WMFAudioMFTManager.h +++ b/dom/media/platforms/wmf/WMFAudioMFTManager.h @@ -47,7 +47,6 @@ private: HRESULT UpdateOutputType(); uint32_t mAudioChannels; - uint32_t mChannelsMap; uint32_t mAudioRate; nsTArray<BYTE> mUserData; |