Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Disable HQ resamplers for now until qualified"

Browse Source
This commit is contained in:
Glenn Kasten
2012-02-10 15:31:54 -08:00
committed by Android (Google) Code Review
parent d335c1cc4f 32d41d56e3
commit 6f5f9ce713
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/audioflinger/Android.mk
View File

@@ -6,9 +6,9 @@ LOCAL_SRC_FILES:= \
AudioFlinger.cpp \ AudioFlinger.cpp \
AudioMixer.cpp.arm \ AudioMixer.cpp.arm \
AudioResampler.cpp.arm \ AudioResampler.cpp.arm \
AudioResamplerSinc.cpp.arm \
AudioResamplerCubic.cpp.arm \
AudioPolicyService.cpp AudioPolicyService.cpp
# AudioResamplerSinc.cpp.arm
# AudioResamplerCubic.cpp.arm
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
system/media/audio_effects/include \ system/media/audio_effects/include \

4
services/audioflinger/AudioResampler.cpp
View File

@@ -23,8 +23,10 @@
#include <cutils/log.h> #include <cutils/log.h>
#include <cutils/properties.h> #include <cutils/properties.h>
#include "AudioResampler.h" #include "AudioResampler.h"
#if 0
#include "AudioResamplerSinc.h" #include "AudioResamplerSinc.h"
#include "AudioResamplerCubic.h" #include "AudioResamplerCubic.h"
#endif
#ifdef __arm__ #ifdef __arm__
#include <machine/cpu-features.h> #include <machine/cpu-features.h>
@@ -99,6 +101,7 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount,
ALOGV("Create linear Resampler"); ALOGV("Create linear Resampler");
resampler = new AudioResamplerOrder1(bitDepth, inChannelCount, sampleRate); resampler = new AudioResamplerOrder1(bitDepth, inChannelCount, sampleRate);
break; break;
#if 0
case MED_QUALITY: case MED_QUALITY:
ALOGV("Create cubic Resampler"); ALOGV("Create cubic Resampler");
resampler = new AudioResamplerCubic(bitDepth, inChannelCount, sampleRate); resampler = new AudioResamplerCubic(bitDepth, inChannelCount, sampleRate);
@@ -107,6 +110,7 @@ AudioResampler* AudioResampler::create(int bitDepth, int inChannelCount,
ALOGV("Create sinc Resampler"); ALOGV("Create sinc Resampler");
resampler = new AudioResamplerSinc(bitDepth, inChannelCount, sampleRate); resampler = new AudioResamplerSinc(bitDepth, inChannelCount, sampleRate);
break; break;
#endif
} }
// initialize resampler // initialize resampler