summaryrefslogtreecommitdiffstats
path: root/services/audioflinger/AudioResampler.h
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2014-07-07 10:21:44 -0700
committerAndy Hung <hunga@google.com>2014-07-07 10:29:36 -0700
commit3348e36c51e91e78020bcc6578eda83d97c31bec (patch)
treeee3df8ed9f79863fc34589813710896a7e08af86 /services/audioflinger/AudioResampler.h
parent075abae2a954bf3edf18ad1705c2c0f188454ae0 (diff)
downloadframeworks_av-3348e36c51e91e78020bcc6578eda83d97c31bec.zip
frameworks_av-3348e36c51e91e78020bcc6578eda83d97c31bec.tar.gz
frameworks_av-3348e36c51e91e78020bcc6578eda83d97c31bec.tar.bz2
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
Diffstat (limited to 'services/audioflinger/AudioResampler.h')
-rw-r--r--services/audioflinger/AudioResampler.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioResampler.h b/services/audioflinger/AudioResampler.h
index b84567e..be747f6 100644
--- a/services/audioflinger/AudioResampler.h
+++ b/services/audioflinger/AudioResampler.h
@@ -22,6 +22,7 @@
#include <cutils/compiler.h>
#include <media/AudioBufferProvider.h>
+#include <system/audio.h>
namespace android {
// ----------------------------------------------------------------------------
@@ -46,7 +47,7 @@ public:
DYN_HIGH_QUALITY=7,
};
- static AudioResampler* create(int bitDepth, int inChannelCount,
+ static AudioResampler* create(audio_format_t format, int inChannelCount,
int32_t sampleRate, src_quality quality=DEFAULT_QUALITY);
virtual ~AudioResampler();
@@ -86,7 +87,7 @@ protected:
// multiplier to calculate fixed point phase increment
static const double kPhaseMultiplier;
- AudioResampler(int bitDepth, int inChannelCount, int32_t sampleRate, src_quality quality);
+ AudioResampler(int inChannelCount, int32_t sampleRate, src_quality quality);
// prevent copying
AudioResampler(const AudioResampler&);
@@ -94,7 +95,6 @@ protected:
int64_t calculateOutputPTS(int outputFrameIndex);
- const int32_t mBitDepth;
const int32_t mChannelCount;
const int32_t mSampleRate;
int32_t mInSampleRate;