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

Commit 06675a84 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 single session VSID voice call support"

parents f1156979 0e109353

hal/audio_hw.c

+2 −0
Original line number Diff line number Diff line
@@ -190,6 +190,8 @@ const char * const use_case_table[AUDIO_USECASE_MAX] = { 
    [USECASE_VOLTE_CALL] = "volte-call",

    [USECASE_QCHAT_CALL] = "qchat-call",

    [USECASE_VOWLAN_CALL] = "vowlan-call",

    [USECASE_VOICEMMODE1_CALL] = "voicemmode1-call",

    [USECASE_VOICEMMODE2_CALL] = "voicemmode2-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

+2 −0
Original line number Diff line number Diff line
@@ -115,6 +115,8 @@ enum { 
    USECASE_VOLTE_CALL,

    USECASE_QCHAT_CALL,

    USECASE_VOWLAN_CALL,

    USECASE_VOICEMMODE1_CALL,

    USECASE_VOICEMMODE2_CALL,

    USECASE_COMPRESS_VOIP_CALL,



    USECASE_INCALL_REC_UPLINK,

hal/msm8974/platform.c

+4 −0
Original line number Diff line number Diff line
@@ -242,6 +242,10 @@ static 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_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

+14 −0
Original line number Diff line number Diff line
@@ -280,6 +280,12 @@ enum { 
#define VOLTE_CALL_PCM_DEVICE 14

#define QCHAT_CALL_PCM_DEVICE 20

#define VOWLAN_CALL_PCM_DEVICE 36

#elif PLATFORM_MSM8996

#define VOICE_CALL_PCM_DEVICE 40

#define VOICE2_CALL_PCM_DEVICE 41

#define VOLTE_CALL_PCM_DEVICE 14

#define QCHAT_CALL_PCM_DEVICE 20

#define VOWLAN_CALL_PCM_DEVICE 33

#else

#define VOICE_CALL_PCM_DEVICE 2

#define VOICE2_CALL_PCM_DEVICE 22
@@ -288,6 +294,14 @@ enum { 
#define VOWLAN_CALL_PCM_DEVICE 36

#endif



#ifdef PLATFORM_MSM8996

#define VOICEMMODE1_CALL_PCM_DEVICE 2

#define VOICEMMODE2_CALL_PCM_DEVICE 22

#else

#define VOICEMMODE1_CALL_PCM_DEVICE 44

#define VOICEMMODE2_CALL_PCM_DEVICE 45

#endif



#define AFE_PROXY_PLAYBACK_PCM_DEVICE 7

#define AFE_PROXY_RECORD_PCM_DEVICE 8

hal/voice.h

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved.

 * Not a contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -24,7 +24,7 @@ 
#define VOICE_SESS_IDX     (BASE_SESS_IDX)



#ifdef MULTI_VOICE_SESSION_ENABLED

#define MAX_VOICE_SESSIONS 5

#define MAX_VOICE_SESSIONS 7

#else

#define MAX_VOICE_SESSIONS 1

#endif