OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Topology: ASRC: Fix mistake with source and sink buffers count 

This patch fixes the apply of DAI_PERIODS for playback sink
and capture source buffers. Also the comments for components
instantiating are fixed to order sink, source as they are
in the parameters to avoid confusion.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This commit is contained in:
Seppo Ingalsuo 2020-02-11 14:18:54 +02:00 committed by Liam Girdwood
parent 569dc48ddf
commit 327631d089
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/topology/sof/pipe-asrc-capture.m4
View File

@ -33,8 +33,8 @@ LIST(` ', `SOF_TKN_ASRC_RATE_IN "PIPELINE_RATE"'
W_DATA(MY_ASRC_CONF, MY_ASRC_TOKENS)
# "ASRC" has x source and 3 sink periods
W_ASRC(0, PIPELINE_FORMAT, DAI_PERIODS, 3, MY_ASRC_CONF)
# "ASRC" has x 3 sink and x source periods
W_ASRC(0, PIPELINE_FORMAT, 3, DAI_PERIODS, MY_ASRC_CONF)
# Capture Buffers
W_BUFFER(0, COMP_BUFFER_SIZE(3,

4
tools/topology/sof/pipe-asrc-playback.m4
View File

@ -37,8 +37,8 @@ LIST(` ', `SOF_TKN_ASRC_RATE_OUT "PIPELINE_RATE"'
W_DATA(MY_ASRC_CONF, MY_ASRC_TOKENS)
# "ASRC" has 2 source and 2 sink periods
W_ASRC(0, PIPELINE_FORMAT, 2, 2, MY_ASRC_CONF)
# "ASRC" has x sink and 2 source periods
W_ASRC(0, PIPELINE_FORMAT, DAI_PERIODS, 2, MY_ASRC_CONF)
# Playback Buffers
W_BUFFER(0, COMP_BUFFER_SIZE(2,

6
tools/topology/sof/pipe-asrc-volume-capture.m4
View File

@ -64,11 +64,11 @@ W_DATA(MY_ASRC_CONF, MY_ASRC_TOKENS)
# Components
#
# "ASRC" has 3 source and 3 sink periods
# "ASRC" has 3 sink and 3 source periods
W_ASRC(0, PIPELINE_FORMAT, 3, 3, MY_ASRC_CONF)
# "Volume" has x source and 3 sink periods
W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 3, MY_PGA_CONF,
# "Volume" has 3 sink and x source periods
W_PGA(0, PIPELINE_FORMAT, 3, DAI_PERIODS, MY_PGA_CONF,
LIST(` ', "PIPELINE_ID Master Capture Volume"))
# Capture Buffers

6
tools/topology/sof/pipe-asrc-volume-playback.m4
View File

@ -48,7 +48,7 @@ LIST(` ', `SOF_TKN_ASRC_RATE_OUT "PIPELINE_RATE"'
` ', `SOF_TKN_ASRC_OPERATION_MODE "0"'))
W_DATA(MY_ASRC_CONF, MY_ASRC_TOKENS)
# "ASRC" has 2 source and 2 sink periods
# "ASRC" has 2 sink and 2 source periods
W_ASRC(0, PIPELINE_FORMAT, 2, 2, MY_ASRC_CONF)
#
@ -61,8 +61,8 @@ LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
W_DATA(MY_PGA_CONF, MY_PGA_TOKENS)
# "Volume" has 2 source and x sink periods
W_PGA(0, PIPELINE_FORMAT, 2, DAI_PERIODS, MY_PGA_CONF,
# "Volume" has x sink and 2 source periods
W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 2, MY_PGA_CONF,
LIST(` ', "PIPELINE_ID Master Playback Volume"))
# Playback Buffers