wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

b=990868 limit ChannelMergerNode output channel count r=padenot

Browse Source 
--HG--
extra : transplant_source : 5S-%40T%8E%8B%F8%B4W%1F%B3%BA5O%83%BF%044%23
This commit is contained in:
Karl Tomlinson 2014-05-16 09:23:38 +12:00
parent 4980cab4b0
commit 152a304e3b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
content/media/webaudio/ChannelMergerNode.cpp
View File

@ -31,7 +31,7 @@ public:
MOZ_ASSERT(aInput.Length() >= 1, "Should have one or more input ports");
// Get the number of output channels, and allocate it
uint32_t channelCount = 0;
size_t channelCount = 0;
for (uint16_t i = 0; i < InputCount(); ++i) {
channelCount += aInput[i].mChannelData.Length();
}
@ -39,17 +39,22 @@ public:
aOutput[0].SetNull(WEBAUDIO_BLOCK_SIZE);
return;
}
channelCount = std::min(channelCount, WebAudioUtils::MaxChannelCount);
AllocateAudioBlock(channelCount, &aOutput[0]);
// Append each channel in each input to the output
uint32_t channelIndex = 0;
for (uint16_t i = 0; i < InputCount(); ++i) {
for (uint32_t j = 0; j < aInput[i].mChannelData.Length(); ++j) {
size_t channelIndex = 0;
for (uint16_t i = 0; true; ++i) {
MOZ_ASSERT(i < InputCount());
for (size_t j = 0; j < aInput[i].mChannelData.Length(); ++j) {
AudioBlockCopyChannelWithScale(
static_cast<const float*>(aInput[i].mChannelData[j]),
aInput[i].mVolume,
static_cast<float*>(const_cast<void*>(aOutput[0].mChannelData[channelIndex])));
++channelIndex;
if (channelIndex >= channelCount) {
return;
}
}
}
}