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

Style fix, and use size_t instead of unsigned int.

Browse source
This commit is contained in:
Ken Cooke 2015-09-14 11:20:38 -07:00
parent 984ea6f2e2
commit bc5532bd0d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -418,15 +418,15 @@ soxr_error_t possibleResampling(soxr_t resampler,
numSourceSamples, numSourceSamples,
sourceAudioFormat, destinationAudioFormat); sourceAudioFormat, destinationAudioFormat);
unsigned int odone = 0; size_t numDestinationSamplesActual = 0;
resampleError = soxr_process(resampler, resampleError = soxr_process(resampler,
channelConversionSamples, numChannelCoversionSamples, NULL, channelConversionSamples, numChannelCoversionSamples, NULL,
destinationSamples, numDestinationSamples, &odone); destinationSamples, numDestinationSamples, &numDestinationSamplesActual);
// return silence instead of playing garbage samples // return silence instead of playing garbage samples
if (odone < numDestinationSamples) { if (numDestinationSamplesActual < numDestinationSamples) {
unsigned int nBytes = (numDestinationSamples - odone) * destinationAudioFormat.channelCount() * sizeof(int16_t); unsigned int nBytes = (numDestinationSamples - numDestinationSamplesActual) * destinationAudioFormat.channelCount() * sizeof(int16_t);
memset(&destinationSamples[odone * destinationAudioFormat.channelCount()], 0, nBytes); memset(&destinationSamples[numDestinationSamplesActual * destinationAudioFormat.channelCount()], 0, nBytes);
qCDebug(audioclient) << "SOXR: padded with" << nBytes << "bytes of silence"; qCDebug(audioclient) << "SOXR: padded with" << nBytes << "bytes of silence";
} }
@ -441,15 +441,15 @@ soxr_error_t possibleResampling(soxr_t resampler,
numAdjustedDestinationSamples /= 2; numAdjustedDestinationSamples /= 2;
} }
unsigned int odone = 0; unsigned int numAdjustedDestinationSamplesActual = 0;
resampleError = soxr_process(resampler, resampleError = soxr_process(resampler,
sourceSamples, numAdjustedSourceSamples, NULL, sourceSamples, numAdjustedSourceSamples, NULL,
destinationSamples, numAdjustedDestinationSamples, &odone); destinationSamples, numAdjustedDestinationSamples, &numAdjustedDestinationSamplesActual);
// return silence instead of playing garbage samples // return silence instead of playing garbage samples
if (odone < numAdjustedDestinationSamples) { if (numAdjustedDestinationSamplesActual < numAdjustedDestinationSamples) {
unsigned int nBytes = (numAdjustedDestinationSamples - odone) * destinationAudioFormat.channelCount() * sizeof(int16_t); unsigned int nBytes = (numAdjustedDestinationSamples - numAdjustedDestinationSamplesActual) * destinationAudioFormat.channelCount() * sizeof(int16_t);
memset(&destinationSamples[odone * destinationAudioFormat.channelCount()], 0, nBytes); memset(&destinationSamples[numAdjustedDestinationSamplesActual * destinationAudioFormat.channelCount()], 0, nBytes);
qCDebug(audioclient) << "SOXR: padded with" << nBytes << "bytes of silence"; qCDebug(audioclient) << "SOXR: padded with" << nBytes << "bytes of silence";
} }
} }