summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2011-01-30 12:40:32 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2011-01-30 12:40:38 -0800
commit1f6c6b785f90f6c074c7d401f9fa537a4fb9f110 (patch)
tree28dd76dedc3af1644ad7b181b93c3adcead88cd5 /media
parentdb207461a16ebcab38b52906ef88228393efca41 (diff)
parente091b1cabc49d46d3afbba4f015f2bffa2934053 (diff)
downloadframeworks_av-1f6c6b785f90f6c074c7d401f9fa537a4fb9f110.zip
frameworks_av-1f6c6b785f90f6c074c7d401f9fa537a4fb9f110.tar.gz
frameworks_av-1f6c6b785f90f6c074c7d401f9fa537a4fb9f110.tar.bz2
Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
Diffstat (limited to 'media')
-rw-r--r--media/libmedia/Visualizer.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp
index a660429..43571cf 100644
--- a/media/libmedia/Visualizer.cpp
+++ b/media/libmedia/Visualizer.cpp
@@ -219,8 +219,13 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform)
}
for (uint32_t i = 0; i < mCaptureSize; i += 2) {
- fft[i] = workspace[i >> 1] >> 24;
- fft[i + 1] = workspace[i >> 1] >> 8;
+ short tmp = workspace[i >> 1] >> 21;
+ while (tmp > 127 || tmp < -128) tmp >>= 1;
+ fft[i] = tmp;
+ tmp = workspace[i >> 1];
+ tmp >>= 5;
+ while (tmp > 127 || tmp < -128) tmp >>= 1;
+ fft[i + 1] = tmp;
}
return NO_ERROR;