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

Commit 22271db8 authored by Surendar karka's avatar Surendar karka Committed by android-build-merger
Browse files

Open second ASM loopback session in RX path. 

am: d517d9d5

* commit 'd517d9d5':
  Open second ASM loopback session in RX path.

Change-Id: I1210b99e90553c4cf2dc0df69fd908db09035aa7
parents cb2f6923 d517d9d5

msm8909/hal/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ LOCAL_SRC_FILES := \ 
LOCAL_SRC_FILES += audio_extn/audio_extn.c \

                   audio_extn/utils.c



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_ASM_LOOPBACK_RX)),true)

  LOCAL_CFLAGS += -DASM_LOOPBACK_RX_ENABLED

endif



ifeq ($(strip $(AUDIO_FEATURE_ENABLED_PCM_OFFLOAD)),true)

    LOCAL_CFLAGS += -DPCM_OFFLOAD_ENABLED

endif

msm8909/hal/audio_extn/hfp.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static int32_t start_hfp(struct audio_device *adev, 
              __func__, pcm_dev_rx_id, pcm_dev_tx_id, uc_info->id);



    ALOGV("%s: Opening PCM playback device card_id(%d) device_id(%d)",

          __func__, adev->snd_card, pcm_dev_rx_id);

          __func__, adev->snd_card, pcm_dev_asm_rx_id);

    hfpmod.hfp_sco_rx = pcm_open(adev->snd_card,

                                  pcm_dev_asm_rx_id,

                                  PCM_OUT, &pcm_config_hfp);

msm8909/hal/msm8916/platform.c

+5 −0
Original line number Diff line number Diff line
@@ -203,8 +203,13 @@ static const int pcm_device_table[AUDIO_USECASE_MAX][2] = { 
    [USECASE_AUDIO_RECORD_FM_VIRTUAL] = {MULTIMEDIA2_PCM_DEVICE,

                                  MULTIMEDIA2_PCM_DEVICE},

    [USECASE_AUDIO_PLAYBACK_FM] = {FM_PLAYBACK_PCM_DEVICE, FM_CAPTURE_PCM_DEVICE},

#ifdef ASM_LOOPBACK_RX_ENABLED

    [USECASE_AUDIO_HFP_SCO] = {HFP_ASM_RX_TX_SESSION2, HFP_ASM_RX_TX_SESSION2},

    [USECASE_AUDIO_HFP_SCO_WB] = {HFP_ASM_RX_TX_SESSION2, HFP_ASM_RX_TX_SESSION2},

#else

    [USECASE_AUDIO_HFP_SCO] = {HFP_PCM_RX, HFP_SCO_RX},

    [USECASE_AUDIO_HFP_SCO_WB] = {HFP_PCM_RX, HFP_SCO_RX},

#endif

    [USECASE_VOICE_CALL] = {VOICE_CALL_PCM_DEVICE, VOICE_CALL_PCM_DEVICE},

    [USECASE_VOICE2_CALL] = {VOICE2_CALL_PCM_DEVICE, VOICE2_CALL_PCM_DEVICE},

    [USECASE_VOLTE_CALL] = {VOLTE_CALL_PCM_DEVICE, VOLTE_CALL_PCM_DEVICE},

msm8909/hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ enum { 
#define HFP_PCM_RX 5

#define HFP_SCO_RX 17

#define HFP_ASM_RX_TX 18

#define HFP_ASM_RX_TX_SESSION2 36



#define INCALL_MUSIC_UPLINK_PCM_DEVICE 1

#define INCALL_MUSIC_UPLINK2_PCM_DEVICE 16