diff options
| author | Glenn Kasten <gkasten@google.com> | 2014-07-15 19:29:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-15 16:05:04 +0000 |
| commit | efebe3974d4ad5870f957b77450c26a499fc467e (patch) | |
| tree | 7d453b970c3f7c83f80fb73cacde3b742976cbf0 /services | |
| parent | 7c5b60ae8b8793b2d601ecf459807c974120331b (diff) | |
| parent | cd704219d22ec51660103684a680caf2c3a12dad (diff) | |
| download | frameworks_av-efebe3974d4ad5870f957b77450c26a499fc467e.zip frameworks_av-efebe3974d4ad5870f957b77450c26a499fc467e.tar.gz frameworks_av-efebe3974d4ad5870f957b77450c26a499fc467e.tar.bz2 | |
Merge "const correctness on downmix and upmix" into lmp-dev
Diffstat (limited to 'services')
| -rwxr-xr-x | services/audioflinger/Threads.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp index decb985..0f01b02 100755 --- a/services/audioflinger/Threads.cpp +++ b/services/audioflinger/Threads.cpp @@ -5234,10 +5234,10 @@ reacquire_wakelock: if (mChannelCount == activeTrack->mChannelCount) { memcpy(dst, src, part1 * mFrameSize); } else if (mChannelCount == 1) { - upmix_to_stereo_i16_from_mono_i16((int16_t *)dst, (int16_t *)src, + upmix_to_stereo_i16_from_mono_i16((int16_t *)dst, (const int16_t *)src, part1); } else { - downmix_to_mono_i16_from_stereo_i16((int16_t *)dst, (int16_t *)src, + downmix_to_mono_i16_from_stereo_i16((int16_t *)dst, (const int16_t *)src, part1); } dst += part1 * activeTrack->mFrameSize; @@ -5309,7 +5309,7 @@ reacquire_wakelock: // the resampler always outputs stereo samples: // do post stereo to mono conversion downmix_to_mono_i16_from_stereo_i16(activeTrack->mSink.i16, - (int16_t *)activeTrack->mRsmpOutBuffer, framesOut); + (const int16_t *)activeTrack->mRsmpOutBuffer, framesOut); } else { ditherAndClamp((int32_t *)activeTrack->mSink.raw, activeTrack->mRsmpOutBuffer, framesOut); |