Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8a1de62 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Channel counts are uint32_t"

parents 2e70b42e f551e996

services/audioflinger/AudioMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

            }

services/audioflinger/Threads.cpp

+2 −2
Original line number Diff line number Diff line
@@ -5255,7 +5255,7 @@ void AudioFlinger::RecordThread::readInputParameters() 
    mRsmpInBuffer = new int16_t[mFrameCount * mChannelCount];



    if (mSampleRate != mReqSampleRate && mChannelCount <= FCC_2 && mReqChannelCount <= FCC_2) {

        int channelCount;

        uint32_t channelCount;

        // optimization: if mono to mono, use the resampler in stereo to stereo mode to avoid

        // stereo to mono post process as the resampler always outputs stereo.

        if (mChannelCount == 1 && mReqChannelCount == 2) {
@@ -5263,7 +5263,7 @@ void AudioFlinger::RecordThread::readInputParameters() 
        } else {

            channelCount = 2;

        }

        mResampler = AudioResampler::create(16, channelCount, mReqSampleRate);

        mResampler = AudioResampler::create(16, (int) channelCount, mReqSampleRate);

        mResampler->setSampleRate(mSampleRate);

        mResampler->setVolume(AudioMixer::UNITY_GAIN, AudioMixer::UNITY_GAIN);

        mRsmpOutBuffer = new int32_t[mFrameCount * FCC_2];