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 | 5bb3090a18ce7d5b8910b8394516efc5fba7b817 (patch) | |
| tree | 1bd3ed8cea2759765f4da12c13d4e771bb0d7465 | |
| parent | 52ee6350390ccbe000b9bf8c2637a968d7951c33 (diff) | |
| parent | f8b667fdbe8ad0f3f05025cf4d2524609a101d7e (diff) | |
| download | frameworks_base-5bb3090a18ce7d5b8910b8394516efc5fba7b817.zip frameworks_base-5bb3090a18ce7d5b8910b8394516efc5fba7b817.tar.gz frameworks_base-5bb3090a18ce7d5b8910b8394516efc5fba7b817.tar.bz2 | |
Merge "Use mul from audioutils"
| -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 |