diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-11-08 19:19:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-08 19:19:00 +0000 |
| commit | d8a1de6204829b0379bbd13042f1450bdb203f2b (patch) | |
| tree | b7b513a563f76060ec82a73aa9ee9543a391b8db /services/audioflinger/AudioMixer.cpp | |
| parent | 2e70b42e2af66f4abb22a95c5d642175c007e256 (diff) | |
| parent | f551e9961a6f66d63bb57f288c4be01b00725289 (diff) | |
| download | frameworks_av-d8a1de6204829b0379bbd13042f1450bdb203f2b.zip frameworks_av-d8a1de6204829b0379bbd13042f1450bdb203f2b.tar.gz frameworks_av-d8a1de6204829b0379bbd13042f1450bdb203f2b.tar.bz2 | |
Merge "Channel counts are uint32_t"
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 1b0b64f..8bea752 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -543,7 +543,7 @@ bool AudioMixer::track_t::setResampler(uint32_t value, uint32_t devSampleRate) resampler = AudioResampler::create( format, // the resampler sees the number of channels after the downmixer, if any - downmixerBufferProvider != NULL ? MAX_NUM_CHANNELS : channelCount, + (int) (downmixerBufferProvider != NULL ? MAX_NUM_CHANNELS : channelCount), devSampleRate, quality); resampler->setLocalTimeFreq(sLocalTimeFreq); } |