commit be83a90bac1a74fa7b21fcd6a05f315827ca941d
author Andy Hung <hunga@google.com> Wed May 23 14:09:24 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed May 23 14:09:24 2018 -0700
tree f3cd032175943bf1a50dd16fbdfc420d1a2ebfc3
parent 819484f7b1cc851573175f16251f8f03325af454
parent 292838cca76071b5adbb25642147cfd4b67d0638

Merge "AudioMixer: recreate Resampler if the track channel count has changed" into pi-dev
am: 292838cca7

Change-Id: I2cfd6d6e1cbd6e538fd99ec5fa28eb829ce7100e

media/libaudioprocessing/AudioMixer.cpp

diff --git a/media/libaudioprocessing/AudioMixer.cpp b/media/libaudioprocessing/AudioMixer.cpp
index aa39443..f6f817a 100644
--- a/media/libaudioprocessing/AudioMixer.cpp
+++ b/media/libaudioprocessing/AudioMixer.cpp
@@ -192,7 +192,6 @@
     // always recompute for both channel masks even if only one has changed.
     const uint32_t trackChannelCount = audio_channel_count_from_out_mask(trackChannelMask);
     const uint32_t mixerChannelCount = audio_channel_count_from_out_mask(mixerChannelMask);
-    const bool mixerChannelCountChanged = track->mMixerChannelCount != mixerChannelCount;
 
     ALOG_ASSERT((trackChannelCount <= MAX_NUM_CHANNELS_TO_DOWNMIX)
             && trackChannelCount
@@ -213,7 +212,7 @@
     // do it after downmix since track format may change!
     track->prepareForReformat();
 
-    if (track->mResampler.get() != nullptr && mixerChannelCountChanged) {
+    if (track->mResampler.get() != nullptr) {
         // resampler channels may have changed.
         const uint32_t resetToSampleRate = track->sampleRate;
         track->mResampler.reset(nullptr);