diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-02-10 15:28:57 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-10 15:28:57 -0800 |
| commit | c8ad36bbb30e99e49026cba78e5e0f83db5cb0f6 (patch) | |
| tree | b11dc2fa925f100ccad66a2f5aa2cf2d01331117 /services/audioflinger | |
| parent | 31f0acff69efd46897221d847becca79ab15105f (diff) | |
| parent | 5b9ff43995f6a6b819d9ad37dd8cdc5ad4a088d7 (diff) | |
| download | frameworks_av-c8ad36bbb30e99e49026cba78e5e0f83db5cb0f6.zip frameworks_av-c8ad36bbb30e99e49026cba78e5e0f83db5cb0f6.tar.gz frameworks_av-c8ad36bbb30e99e49026cba78e5e0f83db5cb0f6.tar.bz2 | |
Merge "Use mul from audioutils"
Diffstat (limited to 'services/audioflinger')
| -rw-r--r-- | services/audioflinger/AudioFlinger.cpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp index d4f8d5c..f033dd5 100644 --- a/services/audioflinger/AudioFlinger.cpp +++ b/services/audioflinger/AudioFlinger.cpp @@ -2504,21 +2504,6 @@ AudioFlinger::DirectOutputThread::~DirectOutputThread() { } -static inline -int32_t mul(int16_t in, int16_t v) -{ -#if defined(__arm__) && !defined(__thumb__) - int32_t out; - asm( "smulbb %[out], %[in], %[v] \n" - : [out]"=r"(out) - : [in]"%r"(in), [v]"r"(v) - : ); - return out; -#else - return in * int32_t(v); -#endif -} - void AudioFlinger::DirectOutputThread::applyVolume(uint16_t leftVol, uint16_t rightVol, bool ramp) { // Do not apply volume on compressed audio |