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

Commit 35f8c7c3 authored by Eric Laurent's avatar Eric Laurent
Browse files

audio policy: add call assistant volume stream 

Routing strategy call assistant was added without
associated volume stream and wass reusing AUDIO_STREAM_PATCH.
This is violating the rule that two strategies cannot
share the same volume stream.

Bug:148588565
Test: play music and check volume
Change-Id: Ib3fb2a1b7b5f3118bf16a3cc9d8e578fa0431645
parent 39d1f3e0

media/libmediahelper/TypeConverter.cpp

+1 −0
Original line number Diff line number Diff line
@@ -315,6 +315,7 @@ const StreamTypeConverter::Table StreamTypeConverter::mTable[] = { 
    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_ASSISTANT),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_REROUTING),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_PATCH),

    MAKE_STRING_FROM_ENUM(AUDIO_STREAM_CALL_ASSISTANT),

    TERMINATOR

};

services/audioflinger/Threads.cpp

+3 −1
Original line number Diff line number Diff line
@@ -1902,9 +1902,11 @@ AudioFlinger::PlaybackThread::PlaybackThread(const sp<AudioFlinger>& audioFlinge 
        mStreamTypes[stream].volume = 0.0f;

        mStreamTypes[stream].mute = mAudioFlinger->streamMute_l(stream);

    }

    // Audio patch volume is always max

    // Audio patch and call assistant volume are always max

    mStreamTypes[AUDIO_STREAM_PATCH].volume = 1.0f;

    mStreamTypes[AUDIO_STREAM_PATCH].mute = false;

    mStreamTypes[AUDIO_STREAM_CALL_ASSISTANT].volume = 1.0f;

    mStreamTypes[AUDIO_STREAM_CALL_ASSISTANT].mute = false;

}



AudioFlinger::PlaybackThread::~PlaybackThread()

services/audiopolicy/engine/common/src/EngineBase.cpp

+12 −2
Original line number Diff line number Diff line
@@ -170,11 +170,15 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig() 
    ALOGE_IF(result.nbSkippedElement != 0, "skipped %zu elements", result.nbSkippedElement);



    engineConfig::VolumeGroup defaultVolumeConfig;

    engineConfig::VolumeGroup defaultSystemVolumeConfig;

    for (auto &volumeConfig : result.parsedConfig->volumeGroups) {

        // save default volume config for streams not defined in configuration

        if (volumeConfig.name.compare("AUDIO_STREAM_MUSIC") == 0) {

            defaultVolumeConfig = volumeConfig;

        }

        if (volumeConfig.name.compare("AUDIO_STREAM_PATCH") == 0) {

            defaultSystemVolumeConfig = volumeConfig;

        }

        loadVolumeConfig(mVolumeGroups, volumeConfig);

    }

    for (auto& strategyConfig : result.parsedConfig->productStrategies) {
@@ -187,10 +191,16 @@ engineConfig::ParsingResult EngineBase::loadAudioPolicyEngineConfig() 
            // If no volume group provided for this strategy, creates a new one using

            // Music Volume Group configuration (considered as the default)

            if (iter == end(mVolumeGroups)) {

                engineConfig::VolumeGroup volumeConfig;

                if (group.stream >= AUDIO_STREAM_PUBLIC_CNT) {

                    volumeConfig = defaultSystemVolumeConfig;

                } else {

                    volumeConfig = defaultVolumeConfig;

                }

                ALOGW("%s: No configuration of %s found, using default volume configuration"

                        , __FUNCTION__, group.volumeGroup.c_str());

                defaultVolumeConfig.name = group.volumeGroup;

                volumeGroup = loadVolumeConfig(mVolumeGroups, defaultVolumeConfig);

                volumeConfig.name = group.volumeGroup;

                volumeGroup = loadVolumeConfig(mVolumeGroups, volumeConfig);

            } else {

                volumeGroup = iter->second;

            }

services/audiopolicy/engine/common/src/EngineDefaultConfig.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ const engineConfig::ProductStrategies gOrderedStrategies = { 
    },

    {"STRATEGY_CALL_ASSISTANT",

     {

         {"", AUDIO_STREAM_PATCH, "AUDIO_STREAM_PATCH",

         {"", AUDIO_STREAM_CALL_ASSISTANT, "AUDIO_STREAM_CALL_ASSISTANT",

          {{AUDIO_CONTENT_TYPE_UNKNOWN, AUDIO_USAGE_CALL_ASSISTANT, AUDIO_SOURCE_DEFAULT, 0, ""}}

         }

     },