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

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

Merge "hal: Add support for VoWLAN feature"

parents 6a4a6b57 7e4fc158

hal/audio_hw.c

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_VOICE2_CALL] = "voice2-call",

    [USECASE_VOLTE_CALL] = "volte-call",

    [USECASE_QCHAT_CALL] = "qchat-call",

    [USECASE_VOWLAN_CALL] = "vowlan-call",

    [USECASE_COMPRESS_VOIP_CALL] = "compress-voip-call",

    [USECASE_INCALL_REC_UPLINK] = "incall-rec-uplink",

    [USECASE_INCALL_REC_DOWNLINK] = "incall-rec-downlink",

hal/audio_hw.h

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ typedef enum { 
    USECASE_VOICE2_CALL,

    USECASE_VOLTE_CALL,

    USECASE_QCHAT_CALL,

    USECASE_VOWLAN_CALL,

    USECASE_COMPRESS_VOIP_CALL,



    USECASE_INCALL_REC_UPLINK,

hal/msm8974/platform.c

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ static const int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [USECASE_VOICE2_CALL] = {VOICE2_CALL_PCM_DEVICE, VOICE2_CALL_PCM_DEVICE},

    [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_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/msm8974/platform.h

+4 −0
Original line number Diff line number Diff line
@@ -194,21 +194,25 @@ enum { 
#define VOICE2_CALL_PCM_DEVICE 14

#define VOLTE_CALL_PCM_DEVICE 17

#define QCHAT_CALL_PCM_DEVICE 18

#define VOWLAN_CALL_PCM_DEVICE 30

#elif PLATFORM_APQ8084

#define VOICE_CALL_PCM_DEVICE 20

#define VOICE2_CALL_PCM_DEVICE 13

#define VOLTE_CALL_PCM_DEVICE 21

#define QCHAT_CALL_PCM_DEVICE 06

#define VOWLAN_CALL_PCM_DEVICE -1

#elif PLATFORM_MSM8610

#define VOICE_CALL_PCM_DEVICE 2

#define VOICE2_CALL_PCM_DEVICE 13

#define VOLTE_CALL_PCM_DEVICE 15

#define QCHAT_CALL_PCM_DEVICE 14

#define VOWLAN_CALL_PCM_DEVICE -1

#else

#define VOICE_CALL_PCM_DEVICE 2

#define VOICE2_CALL_PCM_DEVICE 22

#define VOLTE_CALL_PCM_DEVICE 14

#define QCHAT_CALL_PCM_DEVICE 20

#define VOWLAN_CALL_PCM_DEVICE -1

#endif



#ifdef PLATFORM_MSM8x26

hal/voice.h

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#define VOICE_SESS_IDX     (BASE_SESS_IDX)



#ifdef MULTI_VOICE_SESSION_ENABLED

#define MAX_VOICE_SESSIONS 4

#define MAX_VOICE_SESSIONS 5

#else

#define MAX_VOICE_SESSIONS 1

#endif