Skip to content

topology2: cavs-sdw: add multiband DRC playback pipeline variant #10969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
singalsu wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

topology2: cavs-sdw: add multiband DRC playback pipeline variant #10969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<mixout-gain-micsel-eqiir-eqfir-alh-dai-copier-playback.conf>
<mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.conf>
<mixout-gain-eqiir-eqfir-drc-micsel-eqiir-eqfir-alh-dai-copier-playback.conf>
<mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback.conf>
<mixout-gain-eqiir-dts-alh-dai-copier-playback.conf>
<mixout-gain-eqiir-dts-ctc-alh-dai-copier-playback.conf>
<dai-copier-gain-eqiir-module-copier-capture.conf>
Expand Down Expand Up @@ -116,6 +117,7 @@ Define {
EFX_SPK_IIR_PARAMS "highpass_100hz_0db_48khz"
EFX_SPK_FIR_PARAMS "passthrough"
EFX_SPK_DRC_PARAMS "speaker_default"
EFX_SPK_MBDRC_PARAMS "passthrough"
EFX_MIC_IIR_PARAMS "highpass_40hz_0db_48khz"
EFX_MIC_TDFB_PARAMS "line2_generic_pm10deg"
EFX_MIC_DRC_PARAMS "dmic_default"
Expand Down
9 changes: 9 additions & 0 deletions tools/topology/topology2/development/tplg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,15 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
SDW_JACK_COMPR_AUDIO_FEATURE_CAPTURE=true,SDW_DMIC_COMPR_AUDIO_FEATURE_CAPTURE=true,\
MFCC_FRAME_BYTES=76,MFCC_BLOB=ceps"

# Soundwire topologies with multiband-DRC
"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12-mbdrc\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,\
HDMI1_ID=4,HDMI2_ID=5,HDMI3_ID=6,EFX_DRC_COMPONENT=multiband"

"cavs-sdw\;sof-arl-cs42l43-l0-cs35l56-l23-mbdrc\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-SmartMic,\
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack,\
SDW_JACK_COMPR_AUDIO_FEATURE_CAPTURE=true,EFX_DRC_COMPONENT=multiband"

# Soundwire compressed feature topologies
"cavs-sdw\;sof-sdca-jack-compr\;SDW_JACK=false,NUM_HDMIS=0,COMPRESSED=true,\
COMPRESSED_1=true,COMPRESSED_2=false"
Expand Down
137 changes: 137 additions & 0 deletions ...pology2/include/pipelines/cavs/mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
#
# BE playback pipeline: mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier.
#
# All attributes defined herein are namespaced by alsatplg to
# "Object.Pipeline.mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback.N.attribute_name"
#
# Usage: mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback pipeline object can be
# instantiated as:
#
# Object.Pipeline.mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback."N" {
# time_domain "timer"
# }
#
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/components/eqiir.conf>
<include/components/eqfir.conf>
<include/components/multiband_drc.conf>
<include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf>

Class.Pipeline."mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback" {

SubTreeCopy.baseclass {
# this class extends the mixout-gain-alh-dai-copier-playback pipeline class.
source "Class.Pipeline.mixout-gain-alh-dai-copier-playback"

# target node is not defined which means that the new subtree will be copied to
# the parent node containing the SubTreeCopy node i.e in this case the
# Class.Pipeline.mixout-gain-eqiir-eqfir-mbdrc-alh-dai-copier-playback {} node.

# default copy type is to extend the base class ie the widgets and routes
# will be added to the existing list of widgets/routes in the base class

tree {
Object.Widget {
eqiir."1" {
num_input_audio_formats 1
num_output_audio_formats 1

# 32-bit 48KHz 2ch
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]

Object.Control.bytes."1" {
IncludeByKey.EFX_SPK_IIR_PARAMS {
"passthrough" "include/components/eqiir/passthrough.conf"
"highpass_20hz_0db_48khz" "include/components/eqiir/highpass_20hz_0db_48khz.conf"
"highpass_30hz_0db_48khz" "include/components/eqiir/highpass_30hz_0db_48khz.conf"
"highpass_40hz_0db_48khz" "include/components/eqiir/highpass_40hz_0db_48khz.conf"
"highpass_50hz_0db_48khz" "include/components/eqiir/highpass_50hz_0db_48khz.conf"
"highpass_100hz_0db_48khz" "include/components/eqiir/highpass_100hz_0db_48khz.conf"
}
}
}

eqfir."1" {
num_input_audio_formats 1
num_output_audio_formats 1

# 32-bit 48KHz 2ch
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]

Object.Control.bytes."1" {
IncludeByKey.EFX_SPK_FIR_PARAMS {
"passthrough" "include/components/eqfir/passthrough.conf"
}
}
}

multiband_drc."1" {
num_input_audio_formats 1
num_output_audio_formats 1

# 32-bit 48KHz 2ch
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]

Object.Control.bytes."1" {
IncludeByKey.EFX_SPK_MBDRC_PARAMS {
"passthrough" "include/components/multiband_drc/passthrough.conf"
"default" "include/components/multiband_drc/default.conf"
}
}
}
}

Object.Base {
!route [
{
source gain.$index.1
sink eqiir.$index.1
}
{
source eqiir.$index.1
sink eqfir.$index.1
}
{
source eqfir.$index.1
sink multiband_drc.$index.1
}
]
}
}
}
}
Loading
Loading