diff options
| author | Chia-chi Yeh <chiachi@android.com> | 2010-11-30 11:45:54 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-30 11:45:54 -0800 |
| commit | ecd0a4f0b5bdd51bc35097b402202d6349f016ba (patch) | |
| tree | 4db64af200c0be90a7938d47df543e49ac70bb04 /media | |
| parent | e81e8153c85fa0b0aebae686f6ba51ed2c3a2d11 (diff) | |
| parent | 879e9cb6b4e8b09a5c7d4942ce36125193deadde (diff) | |
| download | frameworks_av-ecd0a4f0b5bdd51bc35097b402202d6349f016ba.zip frameworks_av-ecd0a4f0b5bdd51bc35097b402202d6349f016ba.tar.gz frameworks_av-ecd0a4f0b5bdd51bc35097b402202d6349f016ba.tar.bz2 | |
am 683a7ff9: Merge "Visualizer: Fix the conversion from 8-bit sample to 16-bit sample." into gingerbread
* commit '683a7ff922409d2aa6c944bc4e08de32029e80e5':
Visualizer: Fix the conversion from 8-bit sample to 16-bit sample.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libmedia/Visualizer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/Visualizer.cpp b/media/libmedia/Visualizer.cpp index 68f2e9b..a660429 100644 --- a/media/libmedia/Visualizer.cpp +++ b/media/libmedia/Visualizer.cpp @@ -209,8 +209,8 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform) int32_t nonzero = 0; for (uint32_t i = 0; i < mCaptureSize; i += 2) { - workspace[i >> 1] = (waveform[i] ^ 0x80) << 23; - workspace[i >> 1] |= (waveform[i + 1] ^ 0x80) << 7; + workspace[i >> 1] = + ((waveform[i] ^ 0x80) << 24) | ((waveform[i + 1] ^ 0x80) << 8); nonzero |= workspace[i >> 1]; } @@ -219,8 +219,8 @@ status_t Visualizer::doFft(uint8_t *fft, uint8_t *waveform) } for (uint32_t i = 0; i < mCaptureSize; i += 2) { - fft[i] = workspace[i >> 1] >> 23; - fft[i + 1] = workspace[i >> 1] >> 7; + fft[i] = workspace[i >> 1] >> 24; + fft[i + 1] = workspace[i >> 1] >> 8; } return NO_ERROR; |