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

Commit db421ad1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: msm8916: Add single session voice call usecases and devices" into... 

Merge "hal: msm8916: Add single session voice call usecases and devices" into av-userspace.lnx.1.0-dev.1.0
parents a119a7d1 0d293364

hal/msm8916/platform.c

+4 −12
Original line number Diff line number Diff line
@@ -251,17 +251,11 @@ struct platform_data { 


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 @@ int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [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},

hal/msm8916/platform.h

+0 −6
Original line number Diff line number Diff line
@@ -273,12 +273,6 @@ enum { 
#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