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

Commit 20bd9bfc authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix single channel playback that does not use AUDIO_CHANNEL_OUT_MONO"

parents 983f2e02 73e62e2e

services/audioflinger/AudioMixer.cpp

+3 −2
Original line number Diff line number Diff line
@@ -317,7 +317,7 @@ status_t AudioMixer::track_t::prepareForDownmix() 


    // discard the previous downmixer if there was one

    unprepareForDownmix();

    // Only remix (upmix or downmix) if the track and mixer/device channel masks

    // MONO_HACK Only remix (upmix or downmix) if the track and mixer/device channel masks

    // are not the same and not handled internally, as mono -> stereo currently is.

    if (channelMask == mMixerChannelMask

            || (channelMask == AUDIO_CHANNEL_OUT_MONO
@@ -920,7 +920,8 @@ void AudioMixer::process__validate(state_t* state, int64_t pts) 
            } else {

                if ((n & NEEDS_CHANNEL_COUNT__MASK) == NEEDS_CHANNEL_1){

                    t.hook = getTrackHook(

                            t.mMixerChannelCount == 2 // TODO: MONO_HACK.

                            (t.mMixerChannelMask == AUDIO_CHANNEL_OUT_STEREO  // TODO: MONO_HACK

                                    && t.channelMask == AUDIO_CHANNEL_OUT_MONO)

                                ? TRACKTYPE_NORESAMPLEMONO : TRACKTYPE_NORESAMPLE,

                            t.mMixerChannelCount,

                            t.mMixerInFormat, t.mMixerFormat);