From 92120b317a6c04d1e56336cde295ee8f17274e72 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Fri, 18 Aug 2017 13:44:23 -0700 Subject: [PATCH] Add shifting for 24- and 32-bit audio output Right-shift appropriate # of bits for the higher bit depths. --- src/AudioGeneratorFLAC.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/AudioGeneratorFLAC.cpp b/src/AudioGeneratorFLAC.cpp index c6c729b..8ec418a 100644 --- a/src/AudioGeneratorFLAC.cpp +++ b/src/AudioGeneratorFLAC.cpp @@ -64,7 +64,6 @@ bool AudioGeneratorFLAC::begin(AudioFileSource *source, AudioOutput *output) return true; } -// TODO - convert 24bpp to 16bpp bool AudioGeneratorFLAC::loop() { FLAC__bool ret; @@ -97,10 +96,19 @@ bool AudioGeneratorFLAC::loop() if (buffPtr == buffLen) { return true; // At some point the flac better error and we'll retudn } - - lastSample[AudioOutput::LEFTCHANNEL] = buff[0][buffPtr] & 0xffff; - if (channels==2) lastSample[AudioOutput::RIGHTCHANNEL] = buff[1][buffPtr] & 0xffff; - else lastSample[AudioOutput::RIGHTCHANNEL] = lastSample[AudioOutput::LEFTCHANNEL]; + if (bitsPerSample <= 16) { + lastSample[AudioOutput::LEFTCHANNEL] = buff[0][buffPtr] & 0xffff; + if (channels==2) lastSample[AudioOutput::RIGHTCHANNEL] = buff[1][buffPtr] & 0xffff; + else lastSample[AudioOutput::RIGHTCHANNEL] = lastSample[AudioOutput::LEFTCHANNEL]; + } else if (bitsPerSample <= 24) { + lastSample[AudioOutput::LEFTCHANNEL] = (buff[0][buffPtr]>>8) & 0xffff; + if (channels==2) lastSample[AudioOutput::RIGHTCHANNEL] = (buff[1][buffPtr]>>8) & 0xffff; + else lastSample[AudioOutput::RIGHTCHANNEL] = lastSample[AudioOutput::LEFTCHANNEL]; + } else { + lastSample[AudioOutput::LEFTCHANNEL] = (buff[0][buffPtr]>>16) & 0xffff; + if (channels==2) lastSample[AudioOutput::RIGHTCHANNEL] = (buff[1][buffPtr]>>16) & 0xffff; + else lastSample[AudioOutput::RIGHTCHANNEL] = lastSample[AudioOutput::LEFTCHANNEL]; + } buffPtr++; } while (running && output->ConsumeSample(lastSample));