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

Commit 8178aa5e authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Fix the audio source table in Processing" into main am: 84cfecd6 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2723934



Change-Id: Id3c0075f7048f08ac2b8845eb4ca0dbed9197744
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f52ca0f 84cfecd6

audio/aidl/default/EffectConfig.cpp

+9 −9
Original line number Diff line number Diff line
@@ -196,16 +196,16 @@ std::optional<Processing::Type> EffectConfig::stringToProcessingType(Processing: 
    // see list of audio sources in audio_source_t:

    // system/media/audio/include/system/audio_effects/audio_effects_conf.h

    static const std::map<const std::string, AudioSource> sAudioSourceTable = {

            {MIC_SRC_TAG, AudioSource::VOICE_CALL},

            {VOICE_UL_SRC_TAG, AudioSource::VOICE_CALL},

            {VOICE_DL_SRC_TAG, AudioSource::VOICE_CALL},

            {MIC_SRC_TAG, AudioSource::MIC},

            {VOICE_UL_SRC_TAG, AudioSource::VOICE_UPLINK},

            {VOICE_DL_SRC_TAG, AudioSource::VOICE_DOWNLINK},

            {VOICE_CALL_SRC_TAG, AudioSource::VOICE_CALL},

            {CAMCORDER_SRC_TAG, AudioSource::VOICE_CALL},

            {VOICE_REC_SRC_TAG, AudioSource::VOICE_CALL},

            {VOICE_COMM_SRC_TAG, AudioSource::VOICE_CALL},

            {REMOTE_SUBMIX_SRC_TAG, AudioSource::VOICE_CALL},

            {UNPROCESSED_SRC_TAG, AudioSource::VOICE_CALL},

            {VOICE_PERFORMANCE_SRC_TAG, AudioSource::VOICE_CALL}};

            {CAMCORDER_SRC_TAG, AudioSource::CAMCORDER},

            {VOICE_REC_SRC_TAG, AudioSource::VOICE_RECOGNITION},

            {VOICE_COMM_SRC_TAG, AudioSource::VOICE_COMMUNICATION},

            {REMOTE_SUBMIX_SRC_TAG, AudioSource::REMOTE_SUBMIX},

            {UNPROCESSED_SRC_TAG, AudioSource::UNPROCESSED},

            {VOICE_PERFORMANCE_SRC_TAG, AudioSource::VOICE_PERFORMANCE}};



    if (typeTag == Processing::Type::streamType) {

        auto typeIter = sAudioStreamTypeTable.find(type);