From cd704219d22ec51660103684a680caf2c3a12dad Mon Sep 17 00:00:00 2001 From: Glenn Kasten Date: Mon, 14 Jul 2014 17:26:36 -0700 Subject: const correctness on downmix and upmix Change-Id: I0f51470a6d58a22310ce7cda80afc55e9d6df1dc --- services/audioflinger/Threads.cpp | 6 +++--- 1 file 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); -- cgit v1.1