From 271a4e2cae84a95639685def8491b8af6a80df49 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 10 Mar 2015 13:02:10 -0700 Subject: [PATCH] cleanup some divides for manual sound resampling --- libraries/audio/src/Sound.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libraries/audio/src/Sound.cpp b/libraries/audio/src/Sound.cpp index 41ecfc5c96..6f149bb203 100644 --- a/libraries/audio/src/Sound.cpp +++ b/libraries/audio/src/Sound.cpp @@ -118,18 +118,17 @@ void Sound::downSample(const QByteArray& rawAudioByteArray) { destinationSamples[i / 2] = sourceSamples[i]; destinationSamples[(i / 2) + 1] = sourceSamples[i + 1]; } else { - destinationSamples[i / 2] = (sourceSamples[i] / 2) + (sourceSamples[i + 2] / 2); - destinationSamples[(i / 2) + 1] = (sourceSamples[i + 1] / 2) + (sourceSamples[i + 3] / 2); + destinationSamples[i / 2] = (sourceSamples[i] + sourceSamples[i + 2]) / 2; + destinationSamples[(i / 2) + 1] = (sourceSamples[i + 1] + sourceSamples[i + 3]) / 2; } } } else { for (int i = 1; i < numSourceSamples; i += 2) { if (i + 1 >= numSourceSamples) { - destinationSamples[(i - 1) / 2] = (sourceSamples[i - 1] / 2) + (sourceSamples[i] / 2); + destinationSamples[(i - 1) / 2] = (sourceSamples[i - 1] + sourceSamples[i]) / 2; } else { - destinationSamples[(i - 1) / 2] = (sourceSamples[i - 1] / 4) + (sourceSamples[i] / 2) - + (sourceSamples[i + 1] / 4); + destinationSamples[(i - 1) / 2] = ((sourceSamples[i - 1] + sourceSamples[i + 1]) / 4) + (sourceSamples[i] / 2); } } }