diff options
| author | Glenn Kasten <gkasten@android.com> | 2014-02-05 16:48:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-05 16:48:22 +0000 |
| commit | 4a25471795b05ffcfcc079e9f9cb5ed549023d14 (patch) | |
| tree | 9a9c9a6f9cc355bc9f097c2f1fbd977ca1d749e6 /services/audioflinger/AudioResampler.cpp | |
| parent | 7332c37c459f5f382a9e4105d522d1c5a7f6f0b5 (diff) | |
| parent | 5ef74dce64a1b70534547c044a6d15533f4a9dca (diff) | |
| download | frameworks_av-4a25471795b05ffcfcc079e9f9cb5ed549023d14.zip frameworks_av-4a25471795b05ffcfcc079e9f9cb5ed549023d14.tar.gz frameworks_av-4a25471795b05ffcfcc079e9f9cb5ed549023d14.tar.bz2 | |
am 5ef74dce: am d66cd743: Merge "audioflinger: conform inline ASM to UAL"
* commit '5ef74dce64a1b70534547c044a6d15533f4a9dca':
audioflinger: conform inline ASM to UAL
Diffstat (limited to 'services/audioflinger/AudioResampler.cpp')
| -rw-r--r-- | services/audioflinger/AudioResampler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/services/audioflinger/AudioResampler.cpp b/services/audioflinger/AudioResampler.cpp index 8573e47..07574ab 100644 --- a/services/audioflinger/AudioResampler.cpp +++ b/services/audioflinger/AudioResampler.cpp @@ -571,7 +571,7 @@ void AudioResamplerOrder1::AsmMono16Loop(int16_t *in, int32_t* maxOutPt, int32_t " ldr r8, [sp, #" MO_PARAM5 " + 4]\n" // out " ldr r0, [sp, #" MO_PARAM5 " + 0]\n" // &outputIndex " ldr r0, [r0]\n" // outputIndex - " add r8, r0, asl #2\n" // curOut + " add r8, r8, r0, asl #2\n" // curOut " ldr r9, [sp, #" MO_PARAM5 " + 24]\n" // phaseIncrement " ldr r10, [sp, #" MO_PARAM5 " + 12]\n" // vl " ldr r11, [sp, #" MO_PARAM5 " + 16]\n" // vr @@ -691,7 +691,7 @@ void AudioResamplerOrder1::AsmStereo16Loop(int16_t *in, int32_t* maxOutPt, int32 " ldr r8, [sp, #" ST_PARAM5 " + 4]\n" // out " ldr r0, [sp, #" ST_PARAM5 " + 0]\n" // &outputIndex " ldr r0, [r0]\n" // outputIndex - " add r8, r0, asl #2\n" // curOut + " add r8, r8, r0, asl #2\n" // curOut " ldr r9, [sp, #" ST_PARAM5 " + 24]\n" // phaseIncrement " ldr r10, [sp, #" ST_PARAM5 " + 12]\n" // vl " ldr r11, [sp, #" ST_PARAM5 " + 16]\n" // vr |