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

Commit 9a60538b authored by Andy Hung's avatar Andy Hung
Browse files

Update multichannel audio policy handling 

Ensure AUDIO_FORMAT_PCM_FLOAT and AUDIO_FORMAT_PCM_32_BIT
have proper precedence.
Allow more mixer channels than 2.

Change-Id: I02af97dad6218b25cbada4d93077a213314c6725
parent 141670d4

services/audiopolicy/AudioPolicyManager.cpp

+5 −1
Original line number Diff line number Diff line
@@ -5494,12 +5494,14 @@ audio_channel_mask_t AudioPolicyManager::AudioPort::pickChannelMask() const 
    return channelMask;

}



/* format in order of increasing preference */

const audio_format_t AudioPolicyManager::AudioPort::sPcmFormatCompareTable[] = {

        AUDIO_FORMAT_DEFAULT,

        AUDIO_FORMAT_PCM_16_BIT,

        AUDIO_FORMAT_PCM_8_24_BIT,

        AUDIO_FORMAT_PCM_24_BIT_PACKED,

        AUDIO_FORMAT_PCM_32_BIT,

        AUDIO_FORMAT_PCM_FLOAT,

};



int AudioPolicyManager::AudioPort::compareFormats(audio_format_t format1,
@@ -5541,7 +5543,9 @@ audio_format_t AudioPolicyManager::AudioPort::pickFormat() const 
    }



    audio_format_t format = AUDIO_FORMAT_DEFAULT;

    audio_format_t bestFormat = BEST_MIXER_FORMAT;

    audio_format_t bestFormat =

            AudioPolicyManager::AudioPort::sPcmFormatCompareTable[

                ARRAY_SIZE(AudioPolicyManager::AudioPort::sPcmFormatCompareTable) - 1];

    // For mixed output and inputs, use best mixer output format. Do not

    // limit format otherwise

    if ((mType != AUDIO_PORT_TYPE_MIX) ||

services/audiopolicy/AudioPolicyManager.h

+1 −4
Original line number Diff line number Diff line
@@ -53,10 +53,7 @@ namespace android { 
#define OFFLOAD_DEFAULT_MIN_DURATION_SECS 60



#define MAX_MIXER_SAMPLING_RATE 48000

#define MAX_MIXER_CHANNEL_COUNT 2

// See AudioPort::compareFormats()

#define WORST_MIXER_FORMAT AUDIO_FORMAT_PCM_16_BIT

#define BEST_MIXER_FORMAT AUDIO_FORMAT_PCM_24_BIT_PACKED

#define MAX_MIXER_CHANNEL_COUNT 8



// ----------------------------------------------------------------------------

// AudioPolicyManager implements audio policy manager behavior common to all platforms.