From c1056947dc3ad7d56bebf273cdf24a624cfc72eb Mon Sep 17 00:00:00 2001 From: Shunkai Yao Date: Wed, 23 Aug 2023 16:53:57 +0000 Subject: [PATCH] Fix the audio source table in Processing Bug: 297158046 Test: atest VtsHalAudioEffectTargetTest Change-Id: I7102608b945b92e7d66322bc94130aa965e471ea --- audio/aidl/default/EffectConfig.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/audio/aidl/default/EffectConfig.cpp b/audio/aidl/default/EffectConfig.cpp index 730c0bf758..4a12f8a7df 100644 --- a/audio/aidl/default/EffectConfig.cpp +++ b/audio/aidl/default/EffectConfig.cpp @@ -196,16 +196,16 @@ std::optional 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 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);