Skip to content
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

Tools: Topology2: Swap gain and eqiir in DMIC capture #9700

Merged
merged 1 commit into from
Dec 4, 2024
Merged

Tools: Topology2: Swap gain and eqiir in DMIC capture #9700

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: 1 addition & 1 deletion tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<mixout-gain-dai-copier-playback.conf>
<mixout-gain-smart-amp-dai-copier-playback.conf>
<dai-copier-gain-module-copier-capture.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<dai-copier-gain-eqiir-module-copier-capture.conf>
<gain-module-copier.conf>
<gain-capture.conf>
<gain-copier-capture.conf>
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/cavs-rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<mixout-gain-ctc-dai-copier-playback.conf>
<deepbuffer-playback.conf>
<dai-copier-be.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<dai-copier-gain-eqiir-module-copier-capture.conf>
<gain-capture.conf>
<gain-module-copier.conf>
<google-rtc-aec-capture.conf>
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<host-copier-gain-mixin-playback.conf>
<mixout-gain-alh-dai-copier-playback.conf>
<mixout-gain-eqiir-eqfir-drc-alh-dai-copier-playback.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<dai-copier-gain-eqiir-module-copier-capture.conf>
<gain-capture.conf>
<gain-copier-capture.conf>
<deepbuffer-playback.conf>
Expand Down
18 changes: 9 additions & 9 deletions ...ier-eqiir-gain-module-copier-capture.conf → ...ier-gain-eqiir-module-copier-capture.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#
# BE capture pipeline: dai-copier-eqiir-gain-module-copier-capture
# BE capture pipeline: dai-copier-gain-eqiir-module-copier-capture
#
# All attributes defined herein are namespaced
# by alsatplg to "Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture.N.attribute_name"
# by alsatplg to "Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture.N.attribute_name"
#
# Usage: dai-copier-eqiir-gain-module-copier-capture pipeline object can be instantiated as:
# Usage: dai-copier-gain-eqiir-module-copier-capture pipeline object can be instantiated as:
#
# Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture."N" {
# Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture."N" {
# period 1000
# time_domain "timer"
# }
Expand All @@ -21,7 +21,7 @@
<include/components/eqiir.conf>
<include/components/pipeline.conf>

Class.Pipeline."dai-copier-eqiir-gain-module-copier-capture" {
Class.Pipeline."dai-copier-gain-eqiir-module-copier-capture" {

<include/pipelines/pipeline-common.conf>

Expand All @@ -35,7 +35,7 @@ Class.Pipeline."dai-copier-eqiir-gain-module-copier-capture" {
]

#
# dai-copier-eqiir-gain-module-copier-capture objects instantiated
# dai-copier-gain-eqiir-module-copier-capture objects instantiated
# within the same alsaconf node must have unique pipeline_id
# attribute
#
Expand Down Expand Up @@ -185,12 +185,12 @@ Class.Pipeline."dai-copier-eqiir-gain-module-copier-capture" {

Object.Base {
route.1 {
source gain.$index.1
source eqiir.$index.1
sink module-copier.$index.2
}
route.2 {
source eqiir.$index.1
sink gain.$index.1
source gain.$index.1
sink eqiir.$index.1
}
}

Expand Down
7 changes: 3 additions & 4 deletions tools/topology/topology2/platform/intel/dmic-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ Define {
DMIC0_PCM_NAME "DMIC Raw"
}


# If DMIC0_PCM_CHANNELS is zero, copy it from NUM_DMICS. This
# allows by setting both NUM_DMICS and DMIC0_PCM_CHANNELS to
# have a different channels count in DAI and host.
Expand Down Expand Up @@ -152,7 +151,7 @@ IncludeByKey.PASSTHROUGH {
}
]

Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture [
Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
{
index $DMIC0_DAI_PIPELINE_ID
core_id $DMIC_CORE_ID
Expand Down Expand Up @@ -552,7 +551,7 @@ IncludeByKey.PASSTHROUGH {
Object.Base.route [
{
source $DMIC0_DAI_COPIER
sink eqiir.$DMIC0_DAI_PIPELINE_ID.1
sink gain.$DMIC0_DAI_PIPELINE_ID.1
}
{
source $DMIC0_DAI_PIPELINE_SRC
Expand All @@ -572,7 +571,7 @@ IncludeByKey.PASSTHROUGH {
Object.Base.route [
{
source $DMIC0_DAI_COPIER
sink eqiir.$DMIC0_DAI_PIPELINE_ID.1
sink gain.$DMIC0_DAI_PIPELINE_ID.1
}
{
source $DMIC0_DAI_PIPELINE_SRC
Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/platform/intel/dmic1-mfcc.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Object.Pipeline.host-gateway-capture [
}
]

Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture [
Object.Pipeline.dai-copier-gain-eqiir-module-copier-capture [
{
index $DMIC1_DAI_PIPELINE_ID
core_id $DMIC_CORE_ID
singalsu marked this conversation as resolved.
Show resolved Hide resolved
Expand Down Expand Up @@ -382,7 +382,7 @@ Object.Widget.mfcc.1 {
Object.Base.route [
{
source "dai-copier.DMIC.$DMIC1_NAME.capture"
sink "eqiir.$DMIC1_DAI_PIPELINE_ID.1"
sink "gain.$DMIC1_DAI_PIPELINE_ID.1"
}
{
source module-copier.$DMIC1_DAI_PIPELINE_ID.2
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/sof-hda-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<mixout-gain-efx-mbdrc-dai-copier-playback.conf>
<mixout-gain-host-copier-capture.conf>
<dai-copier-eqiir-module-copier-capture.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<dai-copier-gain-eqiir-module-copier-capture.conf>
<gain-capture.conf>
<deepbuffer-playback.conf>
<io-gateway.conf>
Expand Down
Loading