diff options
| author | Glenn Kasten <gkasten@google.com> | 2013-08-19 18:45:42 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2013-11-06 15:49:00 -0800 |
| commit | f551e9961a6f66d63bb57f288c4be01b00725289 (patch) | |
| tree | 1253e7bc4034a35606881fe75e6c22b3a8c602cc /services/audioflinger/AudioMixer.cpp | |
| parent | d21952fe5bc94f7bb6ee729f806c0e641fdb1a0d (diff) | |
| download | frameworks_av-f551e9961a6f66d63bb57f288c4be01b00725289.zip frameworks_av-f551e9961a6f66d63bb57f288c4be01b00725289.tar.gz frameworks_av-f551e9961a6f66d63bb57f288c4be01b00725289.tar.bz2 | |
Channel counts are uint32_t
Change-Id: I5676b6a291b72d7db6326f7eaf6d17588de51b05
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 91aedbb..8bd04c6 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -566,7 +566,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); } |