diff options
| author | Andy Hung <hunga@google.com> | 2014-01-30 19:19:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-01-30 19:19:45 +0000 |
| commit | e983e0a0017fce81dc3d9bea36f5abb7b7bce40b (patch) | |
| tree | d402cf746d4cd3aa35b54c678d98d1faf998c45c /services/audioflinger/AudioMixer.cpp | |
| parent | 000a4193dd82549192277fd4b9bb571d8a4c262f (diff) | |
| parent | ee931ff7d6620e5705f4dfba901fdb03fa4a35fd (diff) | |
| download | frameworks_av-e983e0a0017fce81dc3d9bea36f5abb7b7bce40b.zip frameworks_av-e983e0a0017fce81dc3d9bea36f5abb7b7bce40b.tar.gz frameworks_av-e983e0a0017fce81dc3d9bea36f5abb7b7bce40b.tar.bz2 | |
Merge "Remove warnings in Audio mixer resampler compilation."
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 6808105..59d1a59 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -229,7 +229,7 @@ status_t AudioMixer::initTrackDownmix(track_t* pTrack, int trackNum, audio_chann return status; } -void AudioMixer::unprepareTrackForDownmix(track_t* pTrack, int trackName) { +void AudioMixer::unprepareTrackForDownmix(track_t* pTrack, int trackName __unused) { ALOGV("AudioMixer::unprepareTrackForDownmix(%d)", trackName); if (pTrack->downmixerBufferProvider != NULL) { @@ -783,8 +783,8 @@ void AudioMixer::track__genericResample(track_t* t, int32_t* out, size_t outFram } } -void AudioMixer::track__nop(track_t* t, int32_t* out, size_t outFrameCount, int32_t* temp, - int32_t* aux) +void AudioMixer::track__nop(track_t* t __unused, int32_t* out __unused, + size_t outFrameCount __unused, int32_t* temp __unused, int32_t* aux __unused) { } @@ -860,8 +860,8 @@ void AudioMixer::volumeStereo(track_t* t, int32_t* out, size_t frameCount, int32 } } -void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount, int32_t* temp, - int32_t* aux) +void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount, + int32_t* temp __unused, int32_t* aux) { const int16_t *in = static_cast<const int16_t *>(t->in); @@ -951,8 +951,8 @@ void AudioMixer::track__16BitsStereo(track_t* t, int32_t* out, size_t frameCount t->in = in; } -void AudioMixer::track__16BitsMono(track_t* t, int32_t* out, size_t frameCount, int32_t* temp, - int32_t* aux) +void AudioMixer::track__16BitsMono(track_t* t, int32_t* out, size_t frameCount, + int32_t* temp __unused, int32_t* aux) { const int16_t *in = static_cast<int16_t const *>(t->in); |