Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 06:23:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix longstanding bug where resampler called with samples instead of frames, resulting in buffer overflow

Browse source
This commit is contained in:
Ken Cooke 2019-06-01 09:05:06 -07:00
parent cabe9eab81
commit 1572c93624
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/audio-client/src/AudioClient.cpp
View file

@ -693,28 +693,20 @@ void possibleResampling(AudioSRC* resampler,
} }
} else { } else {
int numSourceFrames = numSourceSamples / sourceChannelCount;
if (sourceChannelCount != destinationChannelCount) { if (sourceChannelCount != destinationChannelCount) {
int numChannelCoversionSamples = (numSourceSamples * destinationChannelCount) / sourceChannelCount; int16_t* channelConversionSamples = new int16_t[numSourceFrames * destinationChannelCount];
int16_t* channelConversionSamples = new int16_t[numChannelCoversionSamples];
sampleChannelConversion(sourceSamples, channelConversionSamples, numSourceSamples, sampleChannelConversion(sourceSamples, channelConversionSamples, numSourceSamples,
sourceChannelCount, destinationChannelCount); sourceChannelCount, destinationChannelCount);
resampler->render(channelConversionSamples, destinationSamples, numChannelCoversionSamples); resampler->render(channelConversionSamples, destinationSamples, numSourceFrames);
delete[] channelConversionSamples; delete[] channelConversionSamples;
} else { } else {
resampler->render(sourceSamples, destinationSamples, numSourceFrames);
unsigned int numAdjustedSourceSamples = numSourceSamples;
unsigned int numAdjustedDestinationSamples = numDestinationSamples;
if (sourceChannelCount == 2 && destinationChannelCount == 2) {
numAdjustedSourceSamples /= 2;
numAdjustedDestinationSamples /= 2;
}
resampler->render(sourceSamples, destinationSamples, numAdjustedSourceSamples);
} }
} }
} }