hal: msm8916: Add single session voice call usecases and devices
This reverts commit 306e607d1cda0a033a147e6cbec318330c488387 and
added the functionality to support for single session voice call
usecases. PCM device id's for these usecases are updated in
audio_platform_info xml files.
Change-Id: I6229fecaeffe3158a1a22f5f6d98be1e3e997b48
diff --git a/hal/msm8916/platform.c b/hal/msm8916/platform.c
index ea58bf0..4664724 100644
--- a/hal/msm8916/platform.c
+++ b/hal/msm8916/platform.c
@@ -251,17 +251,11 @@
static bool is_external_codec = false;
static const int pcm_device_table_of_ext_codec[AUDIO_USECASE_MAX][2] = {
- [USECASE_QCHAT_CALL] = {QCHAT_CALL_PCM_DEVICE_OF_EXT_CODEC, QCHAT_CALL_PCM_DEVICE_OF_EXT_CODEC},
- [USECASE_VOICEMMODE1_CALL] = {VOICEMMODE1_CALL_PCM_DEVICE_OF_EXT_CODEC,
- VOICEMMODE1_CALL_PCM_DEVICE_OF_EXT_CODEC},
- [USECASE_VOICEMMODE2_CALL] = {VOICEMMODE2_CALL_PCM_DEVICE_OF_EXT_CODEC,
- VOICEMMODE2_CALL_PCM_DEVICE_OF_EXT_CODEC},
+ [USECASE_QCHAT_CALL] = {QCHAT_CALL_PCM_DEVICE_OF_EXT_CODEC, QCHAT_CALL_PCM_DEVICE_OF_EXT_CODEC}
};
/* List of use cases that has different PCM device ID's for internal and external codecs */
-static const int misc_usecase[AUDIO_USECASE_MAX] = {USECASE_QCHAT_CALL,
- USECASE_VOICEMMODE1_CALL,
- USECASE_VOICEMMODE2_CALL};
+static const int misc_usecase[AUDIO_USECASE_MAX] = { USECASE_QCHAT_CALL };
int pcm_device_table[AUDIO_USECASE_MAX][2] = {
[USECASE_AUDIO_PLAYBACK_DEEP_BUFFER] = {DEEP_BUFFER_PCM_DEVICE,
@@ -299,10 +293,8 @@
[USECASE_VOLTE_CALL] = {VOLTE_CALL_PCM_DEVICE, VOLTE_CALL_PCM_DEVICE},
[USECASE_QCHAT_CALL] = {QCHAT_CALL_PCM_DEVICE, QCHAT_CALL_PCM_DEVICE},
[USECASE_VOWLAN_CALL] = {VOWLAN_CALL_PCM_DEVICE, VOWLAN_CALL_PCM_DEVICE},
- [USECASE_VOICEMMODE1_CALL] = {VOICEMMODE1_CALL_PCM_DEVICE,
- VOICEMMODE1_CALL_PCM_DEVICE},
- [USECASE_VOICEMMODE2_CALL] = {VOICEMMODE2_CALL_PCM_DEVICE,
- VOICEMMODE2_CALL_PCM_DEVICE},
+ [USECASE_VOICEMMODE1_CALL] = {-1, -1}, /* pcm ids updated from platform info file */
+ [USECASE_VOICEMMODE2_CALL] = {-1, -1}, /* pcm ids updated from platform info file */
[USECASE_COMPRESS_VOIP_CALL] = {COMPRESS_VOIP_CALL_PCM_DEVICE, COMPRESS_VOIP_CALL_PCM_DEVICE},
[USECASE_INCALL_REC_UPLINK] = {AUDIO_RECORD_PCM_DEVICE,
AUDIO_RECORD_PCM_DEVICE},
diff --git a/hal/msm8916/platform.h b/hal/msm8916/platform.h
index 6996246..da16feb 100644
--- a/hal/msm8916/platform.h
+++ b/hal/msm8916/platform.h
@@ -273,12 +273,6 @@
#define QCHAT_CALL_PCM_DEVICE_OF_EXT_CODEC 28
#define VOWLAN_CALL_PCM_DEVICE 16
-#define VOICEMMODE1_CALL_PCM_DEVICE 26
-#define VOICEMMODE2_CALL_PCM_DEVICE 27
-
-#define VOICEMMODE1_CALL_PCM_DEVICE_OF_EXT_CODEC 29
-#define VOICEMMODE2_CALL_PCM_DEVICE_OF_EXT_CODEC 30
-
#define AFE_PROXY_PLAYBACK_PCM_DEVICE 7
#define AFE_PROXY_RECORD_PCM_DEVICE 8