Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 02:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 1480661 avoid reading channel count of most recent delay buffer input when reading samples at max delay r=padenot

Browse Source 
When maxDelay was mMaxDelayTicks and these were an integer multiple of block
size, the +1 for determining oldestChunk was enough to wrap around the buffer
and find the most recent chunk, which may have a different channel count to
that of the oldest.

MozReview-Commit-ID: KakFeGzuvsW

--HG--
extra : rebase_source : 51c2ab1dffb7ffa9e941b06e379eacacfaa6904a
This commit is contained in:
Karl Tomlinson 2018-08-02 17:36:05 +12:00
parent ce0c5871ef
commit d70e1cc5fa
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dom/media/webaudio/DelayBuffer.cpp
View File

@ -71,8 +71,8 @@ DelayBuffer::Read(const double aPerFrameDelays[WEBAUDIO_BLOCK_SIZE],
}
// Now find the chunks touched by this range and check their channel counts.
int oldestChunk = ChunkForDelay(int(maxDelay) + 1);
int youngestChunk = ChunkForDelay(minDelay);
int oldestChunk = ChunkForDelay(std::ceil(maxDelay));
int youngestChunk = ChunkForDelay(std::floor(minDelay));
uint32_t channelCount = 0;
for (int i = oldestChunk; true; i = (i + 1) % chunkCount) {
@ -146,9 +146,12 @@ DelayBuffer::ReadChannels(const double aPerFrameDelays[WEBAUDIO_BLOCK_SIZE],
for (unsigned tick = 0; tick < ArrayLength(positions); ++tick) {
int readChunk = ChunkForPosition(positions[tick]);
// mVolume is not set on default initialized chunks so handle null
// The zero check on interpolationFactor is important because, when
// currentDelay is integer, positions[0] may be outside the range
// considered for determining totalChannelCount.
// mVolume is not set on default initialized chunks so also handle null
// chunks specially.
if (!mChunks[readChunk].IsNull()) {
if (interpolationFactor != 0.0 && !mChunks[readChunk].IsNull()) {
int readOffset = OffsetForPosition(positions[tick]);
UpdateUpmixChannels(readChunk, totalChannelCount,
aChannelInterpretation);