Skip to content
Snippets Groups Projects
Commit ca52121e authored by Srini Kandagatla's avatar Srini Kandagatla
Browse files

audioreach: remove unncessary pcm cnv in capture path 


Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
parent 5437283a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
SM8250-MTP-WCD9380-WSA8810-VA-DMIC.m4
+ 4
− 4
View file @ ca52121e
......@@ -22,11 +22,11 @@ STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTI
0x00004002, 0x00004002, 0x00006010)
dnl Capture MultiMedia3
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA3,
`S16_LE', 48000, 48000, 2, 2,
`S16_LE', 48000, 48000, 1, 2,
0x00004003, 0x00004003, 0x00006020)
dnl Capture MultiMedia4
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA4,
`S16_LE', 48000, 48000, 2, 2,
`S16_LE', 48000, 48000, 1, 2,
0x00004004, 0x00004004, 0x00006030)
#
#
......@@ -61,13 +61,13 @@ DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `RX_CODEC_DMA_RX
dnl
dnl VA Capture
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0,
`S16_LE', 48000, 48000, 2, 2,
`S16_LE', 48000, 48000, 1, 2,
LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT,
0x00004008, 0x00004008, 0x00006080)
dnl
dnl WCDTX Capture
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_3', TX_CODEC_DMA_TX_3,
`S16_LE', 48000, 48000, 2, 2,
`S16_LE', 48000, 48000, 1, 2,
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_TX3, 0, DATA_FORMAT_FIXED_POINT,
0x00004009, 0x00004009, 0x00006090)
......
audioreach/audioreach.m4
+ 2
− 0
View file @ ca52121e
......@@ -91,7 +91,9 @@ define(`MODULE_ID_PLACEHOLDER_ENCODER', `0x07001008') dnl
define(`MODULE_ID_PLACEHOLDER_DECODER', `0x07001009') dnl
define(`MODULE_ID_I2S_SINK', `0x0700100A') dnl
define(`MODULE_ID_I2S_SOURCE', `0x0700100B') dnl
define(`MODULE_ID_MFC', `0x07001015') dnl
define(`MODULE_ID_VOL_CTRL', `0x0700101B') dnl
define(`MODULE_ID_SMECNS_V2', `0x07001031') dnl
dnl Linux frontend dai ids
define(`FRONTEND_DAI_MULTIMEDIA1', `1') dnl
define(`FRONTEND_DAI_MULTIMEDIA2', `2') dnl
......
audioreach/subgraph-device-codec-dma-capture.m4
+ 6
− 16
View file @ ca52121e
......@@ -3,21 +3,17 @@ include(`util/pcm.m4') dnl
include(`audioreach/subgraph.m4') dnl
include(`audioreach/container.m4') dnl
include(`audioreach/module_log.m4') dnl
include(`audioreach/module_pcmenc.m4') dnl
include(`audioreach/module_pcmcnv.m4') dnl
include(`audioreach/module_codec_dma.m4') dnl
include(`util/mixer.m4') dnl
dnl
#
# SubGraph for Device Backend
#
# ________________________________________________
# | Sub Graph |
# [KControl]->| [DEVICE-TX] <- [PCM CNV] <- [PCM-ENC] <- [DEVICE EP] |
# Switch |________________________________________________|
# ___________________________
# | Sub Graph |
# [KControl]->| [DEVICE-TX] <- [LOGGER] |
# Switch |__________________________|
undefine(`CDC_DMA_MODULE_IID') dnl
undefine(`PCMENC_MODULE_IID') dnl
undefine(`PCMCNV_MODULE_IID') dnl
undefine(`LOG_MODULE_IID') dnl
undefine(`SG_INDEX') dnl
undefine(`CONTAINER_INDEX') dnl
......@@ -38,9 +34,7 @@ define(`DEVICE_DOMAIN_ID', APM_PROC_DOMAIN_ID_ADSP) dnl'
define(`CONT_STACK_SIZE', 8192) dnl'
define(`CDC_DMA_MODULE_IID', MOD_IID_START) dnl
define(`PCMENC_MODULE_IID', eval(MOD_IID_START + 1)) dnl
define(`PCMCNV_MODULE_IID', eval(MOD_IID_START + 2)) dnl
define(`LOG_MODULE_IID', eval(MOD_IID_START + 3)) dnl
define(`LOG_MODULE_IID', eval(MOD_IID_START + 1)) dnl
define(`SG_INDEX', 1) dnl
define(`CONTAINER_INDEX', 1) dnl
define(`MOD_INDEX', 1) dnl
......@@ -52,9 +46,7 @@ define(`DEVICE_CAPTURE_ROUTE',
` index STR($1)'
` lines ['
` "NAME_PREFIX.codec_dma_tx$1, , $2 Capture"'
` "NAME_PREFIX.pcm_encoder$1, , NAME_PREFIX.codec_dma_tx$1"'
` "NAME_PREFIX.pcm_converter$1, , NAME_PREFIX.pcm_encoder$1"'
` "NAME_PREFIX.logger$1, , NAME_PREFIX.pcm_converter$1"'
` "NAME_PREFIX.logger$1, , NAME_PREFIX.codec_dma_tx$1"'
` ]'
`}')
......@@ -63,8 +55,6 @@ AR_SUBGRAPH(SG_INDEX, DEVICE_DAI_ID, SG_IID_START, DEVICE_PERF_MODE, DEVICE_DIRE
AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, CONT_CAP, CONT_STACK_SIZE, CONT_POSITION, DEVICE_DOMAIN_ID)
AR_MODULE_CODEC_DMA_TX(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, CDC_DMA_MODULE_IID, 0, 1, 0, 2, 0, 2, DEVICE_INTF_TYPE, DEVICE_INTF_INDEX, DEVICE_DATA_FORMAT, `DEVICE_NAME')
AR_MODULE_PCMENC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMENC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED)
AR_MODULE_LOG( MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019ab, 1, 0)
dnl kcontrol switch
DEVICE_CAPTURE_MIXER(SG_INDEX, `DEVICE_NAME')
......
audioreach/subgraph-stream-vol-playback.m4
+ 8
− 8
View file @ ca52121e
......@@ -45,13 +45,13 @@ dnl
dnl STREAM_PLAYBACK_ROUTE(stream-index)
define(`STREAM_PLAYBACK_ROUTE',
`'
`SectionGraph."NAME_PREFIX.$1 Graph" {'
` index STR($1)'
`SectionGraph."NAME_PREFIX.$2 Graph" {'
` index STR($2)'
` lines ['
` "NAME_PREFIX.pcm_decoder$1, , NAME_PREFIX.wrsh_ep$1"'
` "NAME_PREFIX.pcm_converter$1, , NAME_PREFIX.pcm_decoder$1"'
` "NAME_PREFIX.vol_ctrl$1, , NAME_PREFIX.pcm_converter$1"'
` "NAME_PREFIX.logger$1, , NAME_PREFIX.vol_ctrl$1"'
` "NAME_PREFIX.pcm_decoder$2, , NAME_PREFIX.wrsh_ep$2"'
` "NAME_PREFIX.pcm_converter$2, , NAME_PREFIX.pcm_decoder$2"'
` "NAME_PREFIX.vol_ctrl$1, , NAME_PREFIX.pcm_converter$2"'
` "NAME_PREFIX.logger$2, , NAME_PREFIX.vol_ctrl$1"'
` ]'
`}')
......@@ -65,7 +65,7 @@ AR_CONTAINER(CONTAINER_INDEX, CONT_IID_START, APM_CONTAINER_CAP_ID_CD, 8192, AP
AR_MODULE_WRSH(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, WRSH_MODULE_IID, 0, 1, 0, 0, 0, 2, PCM_DAI_ID)
AR_MODULE_PCMDEC(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMDEC_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_INTERLEAVED)
AR_MODULE_PCMCNV(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, PCMCNV_MODULE_IID, 1, 1, 2, 1, 1, 2, PCM_DEINTERLEAVED_UNPACKED)
AR_MODULE_VOL_CTRL(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2)
AR_MODULE_VOL_CTRL(PCM_DAI_ID, SG_INDEX, CONTAINER_INDEX, VOLCTRL_MODULE_IID,1, 1, 2, 1, 1, 2)
AR_MODULE_LOG(MOD_INDEX, SG_INDEX, CONTAINER_INDEX, LOG_MODULE_IID, 1, 1, 2, 1, 1, 2, 0x000019af, 1, 0)
STREAM_PLAYBACK_MIXER(PCM_DAI_ID, SG_INDEX)
STREAM_PLAYBACK_ROUTE(MOD_INDEX)
STREAM_PLAYBACK_ROUTE(PCM_DAI_ID, MOD_INDEX)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment