mirror of https://github.com/thesofproject/sof.git
Tools: Topology: Change playback volume ramp duration to 20 ms
This patch shortens the ramp duration to 20 ms from 250 ms in all topologies with volume playback. In addition the zero crossings detector mode is enabled to mitigate zipper noise. The change includes for the not yet updated pipeline macros a rename of macro for tokens data with pipeline number suffix to ensure no undesired volume instances are impacted by this change. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
This commit is contained in:
parent
259a98ed4c
commit
673e335a7a
|
@ -57,8 +57,8 @@ W_ASRC(0, PIPELINE_FORMAT, 2, 2, MY_ASRC_CONF)
|
|||
define(MY_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
||||
define(MY_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
W_VENDORTUPLES(MY_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
W_DATA(MY_PGA_CONF, MY_PGA_TOKENS)
|
||||
|
||||
# "Volume" has x sink and 2 source periods
|
||||
|
|
|
@ -33,8 +33,8 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID,
|
|||
define(MY_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
||||
define(MY_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
W_VENDORTUPLES(MY_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
|
||||
W_DATA(MY_PGA_CONF, MY_PGA_TOKENS)
|
||||
|
||||
|
|
|
@ -35,8 +35,8 @@ define(DEF_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
|||
define(DEF_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
|
||||
W_VENDORTUPLES(DEF_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
|
||||
W_DATA(DEF_PGA_CONF, DEF_PGA_TOKENS)
|
||||
|
||||
|
|
|
@ -37,8 +37,8 @@ define(DEF_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
|||
define(DEF_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
|
||||
W_VENDORTUPLES(DEF_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
|
||||
W_DATA(DEF_PGA_CONF, DEF_PGA_TOKENS)
|
||||
|
||||
|
|
|
@ -35,8 +35,8 @@ define(DEF_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
|||
define(DEF_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
|
||||
W_VENDORTUPLES(DEF_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
|
||||
W_DATA(DEF_PGA_CONF, DEF_PGA_TOKENS)
|
||||
|
||||
|
|
|
@ -49,15 +49,17 @@ W_SRC(0, PIPELINE_FORMAT, 3, 3, media_src_conf)
|
|||
# Volume Configuration
|
||||
#
|
||||
|
||||
W_VENDORTUPLES(playback_pga_tokens, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
define(DEF_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
||||
define(DEF_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
|
||||
W_VENDORTUPLES(DEF_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
|
||||
W_DATA(playback_pga_conf, playback_pga_tokens)
|
||||
W_DATA(DEF_PGA_CONF, DEF_PGA_TOKENS)
|
||||
|
||||
# "Volume" has 3 source and x sink periods
|
||||
W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 3, playback_pga_conf, SCHEDULE_CORE,
|
||||
W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 3, DEF_PGA_CONF, SCHEDULE_CORE,
|
||||
LIST(` ', "PIPELINE_ID Master Playback Volume"))
|
||||
|
||||
# Playback Buffers
|
||||
|
@ -96,3 +98,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), SRC Playback PCM_ID)
|
|||
|
||||
PCM_CAPABILITIES(SRC Playback PCM_ID, `S32_LE,S24_LE,S16_LE', 8000, 192000, 2, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)
|
||||
|
||||
undefine(`DEF_PGA_TOKENS')
|
||||
undefine(`DEF_PGA_CONF')
|
||||
|
|
|
@ -29,11 +29,14 @@ C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID,
|
|||
# Volume configuration
|
||||
#
|
||||
|
||||
W_VENDORTUPLES(playback_pga_tokens, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "0"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "250"'))
|
||||
define(DEF_PGA_TOKENS, concat(`pga_tokens_', PIPELINE_ID))
|
||||
define(DEF_PGA_CONF, concat(`pga_conf_', PIPELINE_ID))
|
||||
|
||||
W_DATA(playback_pga_conf, playback_pga_tokens)
|
||||
W_VENDORTUPLES(DEF_PGA_TOKENS, sof_volume_tokens,
|
||||
LIST(` ', `SOF_TKN_VOLUME_RAMP_STEP_TYPE "2"'
|
||||
` ', `SOF_TKN_VOLUME_RAMP_STEP_MS "20"'))
|
||||
|
||||
W_DATA(DEF_PGA_CONF, DEF_PGA_TOKENS)
|
||||
|
||||
#
|
||||
# Components and Buffers
|
||||
|
@ -44,7 +47,7 @@ W_DATA(playback_pga_conf, playback_pga_tokens)
|
|||
W_PCM_PLAYBACK(PCM_ID, Passthrough Playback, 2, 0, SCHEDULE_CORE)
|
||||
|
||||
# "Volume" has 2 source and x sink periods
|
||||
W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 2, playback_pga_conf, SCHEDULE_CORE,
|
||||
W_PGA(0, PIPELINE_FORMAT, DAI_PERIODS, 2, DEF_PGA_CONF, SCHEDULE_CORE,
|
||||
LIST(` ', "PIPELINE_ID Master Playback Volume"))
|
||||
|
||||
# Playback Buffers
|
||||
|
@ -79,3 +82,5 @@ indir(`define', concat(`PIPELINE_PCM_', PIPELINE_ID), Passthrough Playback PCM_I
|
|||
#
|
||||
PCM_CAPABILITIES(Passthrough Playback PCM_ID, `S32_LE,S24_LE,S16_LE', PCM_MIN_RATE, PCM_MAX_RATE, 2, PIPELINE_CHANNELS, 2, 16, 192, 16384, 65536, 65536)
|
||||
|
||||
undefine(`DEF_PGA_TOKENS')
|
||||
undefine(`DEF_PGA_CONF')
|
||||
|
|
Loading…
Reference in New Issue