From 5e58b0abe5b6c8f5bd96a8f78bbeeeb4d3892020 Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Mon, 23 Jun 2014 19:07:29 -0700 Subject: Add floating point volume handling to AudioMixer Use floating point volume in AudioMixer mixing when floating point input is used with the new mixer engine. AudioResampler is updated to take floating point volume to match. Both legacy integer and floating point mixer engines work. For now, integer volume is used when the new mixer engine runs in integer input mode, for backward compatibility with the legacy mixer. The new mixer engine will generally run in floating point input mode. When the legacy path is removed, the integer volumes will be removed. Change-Id: I79e80c292ae7c8b8bdd0aa371a1b2c3a1b618290 --- services/audioflinger/AudioResampler.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'services/audioflinger/AudioResampler.cpp') diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp index 38c9061..1f7a613 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include "AudioResampler.h" #include "AudioResamplerSinc.h" #include "AudioResamplerCubic.h" @@ -266,8 +267,9 @@ AudioResampler::AudioResampler(int inChannelCount, mPhaseFraction(0), mLocalTimeFreq(0), mPTS(AudioBufferProvider::kInvalidPTS), mQuality(quality) { + const int maxChannels = quality < DYN_LOW_QUALITY ? 2 : 8; if (inChannelCount < 1 - || inChannelCount > (quality < DYN_LOW_QUALITY ? 2 : 8)) { + || inChannelCount > maxChannels) { LOG_ALWAYS_FATAL("Unsupported sample format %d quality %d channels", quality, inChannelCount); } @@ -297,10 +299,12 @@ void AudioResampler::setSampleRate(int32_t inSampleRate) { mPhaseIncrement = (uint32_t)((kPhaseMultiplier * inSampleRate) / mSampleRate); } -void AudioResampler::setVolume(int16_t left, int16_t right) { +void AudioResampler::setVolume(float left, float right) { // TODO: Implement anti-zipper filter - mVolume[0] = left; - mVolume[1] = right; + // convert to U4.12 for internal integer use (round down) + // integer volume values are clamped to 0 to UNITY_GAIN. + mVolume[0] = u4_12_from_float(clampFloatVol(left)); + mVolume[1] = u4_12_from_float(clampFloatVol(right)); } void AudioResampler::setLocalTimeFreq(uint64_t freq) { -- cgit v1.1