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

    // 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

    // 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);