Configure the resampler with the correct channel count when downmixing

When a track needs to be downmixed and resampled, it gets downmixed
 first before being resampled. Therefore the resampler needs to
 be configured with the channel count of the output of the downmixer
 instead of that of the track.
Removed frame size checks that don't apply anymore now that we support
 frame sizes that are not powers of 2 (e.g. 12 for 5.1 16bits), and
 changed test performed for every buffer during playback into an
 assert.

Change-Id: Ia220f00ee382f4f7848b661c58555bdca664e194

1 files changed, 5 insertions, 2 deletions

diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 100f289..4c9e04a 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -98,7 +98,7 @@ AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate, uint32_t maxNumTr
 {
     // AudioMixer is not yet capable of multi-channel beyond stereo
     COMPILE_TIME_ASSERT_FUNCTION_SCOPE(2 == MAX_NUM_CHANNELS);
-    
+
     ALOG_ASSERT(maxNumTracks <= MAX_NUM_TRACKS, "maxNumTracks %u > MAX_NUM_TRACKS %u",
             maxNumTracks, MAX_NUM_TRACKS);
 
@@ -504,7 +504,10 @@ bool AudioMixer::track_t::setResampler(uint32_t value, uint32_t devSampleRate)
             sampleRate = value;
             if (resampler == NULL) {
                 resampler = AudioResampler::create(
-                        format, channelCount, devSampleRate);
+                        format,
+                        // the resampler sees the number of channels after the downmixer, if any
+                        downmixerBufferProvider != NULL ? MAX_NUM_CHANNELS : channelCount,
+                        devSampleRate);
                 resampler->setLocalTimeFreq(localTimeFreq);
             }
             return true;