From 3348e36c51e91e78020bcc6578eda83d97c31bec Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Mon, 7 Jul 2014 10:21:44 -0700 Subject: Replace int bitDepth with audio_format_t in Resampler Remove mBitDepth from class (not used). Replace with audio_format_t in factory method to distinguish between float and pcm 16-bit. Change-Id: I166860796c68285077ef4458d8758d19b82523f9 --- services/audioflinger/tests/resampler_tests.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'services/audioflinger/tests') diff --git a/services/audioflinger/tests/resampler_tests.cpp b/services/audioflinger/tests/resampler_tests.cpp index d76c376..987162c 100644 --- a/services/audioflinger/tests/resampler_tests.cpp +++ b/services/audioflinger/tests/resampler_tests.cpp @@ -69,7 +69,7 @@ void testBufferIncrement(size_t channels, bool useFloat, unsigned inputFreq, unsigned outputFreq, enum android::AudioResampler::src_quality quality) { - const int bits = useFloat ? 32 : 16; + const audio_format_t format = useFloat ? AUDIO_FORMAT_PCM_FLOAT : AUDIO_FORMAT_PCM_16_BIT; // create the provider std::vector inputIncr; SignalProvider provider; @@ -92,7 +92,7 @@ void testBufferIncrement(size_t channels, bool useFloat, const int volumePrecision = 12; /* typical unity gain */ android::AudioResampler* resampler; - resampler = android::AudioResampler::create(bits, channels, outputFreq, quality); + resampler = android::AudioResampler::create(format, channels, outputFreq, quality); resampler->setSampleRate(inputFreq); resampler->setVolume(1 << volumePrecision, 1 << volumePrecision); @@ -109,7 +109,7 @@ void testBufferIncrement(size_t channels, bool useFloat, resampler->reset(); #else delete resampler; - resampler = android::AudioResampler::create(bits, channels, outputFreq, quality); + resampler = android::AudioResampler::create(format, channels, outputFreq, quality); resampler->setSampleRate(inputFreq); resampler->setVolume(1 << volumePrecision, 1 << volumePrecision); #endif @@ -174,7 +174,8 @@ void testStopbandDownconversion(size_t channels, const int volumePrecision = 12; /* typical unity gain */ android::AudioResampler* resampler; - resampler = android::AudioResampler::create(16, channels, outputFreq, quality); + resampler = android::AudioResampler::create(AUDIO_FORMAT_PCM_16_BIT, + channels, outputFreq, quality); resampler->setSampleRate(inputFreq); resampler->setVolume(1 << volumePrecision, 1 << volumePrecision); -- cgit v1.1