Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions tools/topology/topology2/cavs-nocodec.conf
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-module-copier-capture.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<gain-module-copier.conf>
<gain-capture.conf>
<gain-copier-capture.conf>
Expand Down Expand Up @@ -57,10 +57,9 @@ Define {
# override DMIC default definitions
DMIC0_HOST_PIPELINE_ID 13
DMIC0_DAI_PIPELINE_ID 14
DMIC0_HOST_PIPELINE_SINK 'gain.13.1'
DMIC0_HOST_PIPELINE_SINK 'host-copier.10.capture'
DMIC0_DAI_PIPELINE_SRC 'module-copier.14.2'
DMIC0_DAI_COPIER 'dai-copier.DMIC.NoCodec-6.capture'
DMIC0_DAI_GAIN 'eqiir.14.1'
DMIC0_NAME 'NoCodec-6'
DMIC1_NAME 'NoCodec-7'
DMIC0_PCM_CAPS 'Gain Capture 13'
Expand Down
5 changes: 2 additions & 3 deletions tools/topology/topology2/cavs-rt5682.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<mixout-gain-eqiir-dts-dai-copier-playback.conf>
<deepbuffer-playback.conf>
<dai-copier-be.conf>
<dai-copier-eqiir-module-copier-capture.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<gain-capture.conf>
<gain-module-copier.conf>
<google-rtc-aec-capture.conf>
Expand Down Expand Up @@ -57,10 +57,9 @@ Define {
DMIC1_ID 2
DMIC0_HOST_PIPELINE_ID 13
DMIC0_DAI_PIPELINE_ID 14
DMIC0_HOST_PIPELINE_SINK 'gain.13.1'
DMIC0_HOST_PIPELINE_SINK 'host-copier.99.capture'
DMIC0_DAI_PIPELINE_SRC 'module-copier.14.2'
DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture'
DMIC0_DAI_GAIN 'eqiir.14.1'
DMIC0_NAME 'dmic01'
DMIC0_PCM_CAPS 'Gain Capture 13'
# override BE link ids
Expand Down
5 changes: 2 additions & 3 deletions tools/topology/topology2/cavs-sdw.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<virtual.conf>
<host-copier-gain-mixin-playback.conf>
<mixout-gain-alh-dai-copier-playback.conf>
<dai-copier-eqiir-module-copier-capture.conf>
<dai-copier-eqiir-gain-module-copier-capture.conf>
<gain-capture.conf>
<gain-copier-capture.conf>
<deepbuffer-playback.conf>
Expand Down Expand Up @@ -56,10 +56,9 @@ Define {
PDM1_MIC_B_ENABLE 1
DMIC0_HOST_PIPELINE_ID 100
DMIC0_DAI_PIPELINE_ID 101
DMIC0_HOST_PIPELINE_SINK 'gain.100.1'
DMIC0_HOST_PIPELINE_SINK 'host-copier.10.capture'
DMIC0_DAI_PIPELINE_SRC 'module-copier.101.2'
DMIC0_DAI_COPIER 'dai-copier.DMIC.dmic01.capture'
DMIC0_DAI_GAIN 'eqiir.101.1'
DMIC0_NAME 'dmic01'
DMIC0_ID 4
DMIC1_ID 5
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@
#
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@singalsu if this PR is not too urgent, can it wait till the new pipeline extension template goes upstream?

# BE capture pipeline: dai-copier-eqiir-gain-module-copier-capture
#
# All attributes defined herein are namespaced
# by alsatplg to "Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture.N.attribute_name"
#
# Usage: dai-copier-eqiir-gain-module-copier-capture pipeline object can be instantiated as:
#
# Object.Pipeline.dai-copier-eqiir-gain-module-copier-capture."N" {
# period 1000
# time_domain "timer"
# }
#
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/components/dai-copier.conf>
<include/controls/bytes.conf>
<include/components/eqiir.conf>
<include/components/pipeline.conf>
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Include of gain.conf is missing, build it worked because it was included somewhere else.


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

<include/pipelines/pipeline-common.conf>

attributes {
!constructor [
"index"
]

!immutable [
"direction"
]

#
# dai-copier-eqiir-gain-module-copier-capture objects instantiated
# within the same alsaconf node must have unique pipeline_id
# attribute
#
unique "instance"
}

Object.Widget {
dai-copier."1" {
type dai_out
num_input_audio_formats 2
num_output_audio_formats 2
num_output_pins 1

Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
}
]

Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
]
}

eqiir."1" {
num_input_audio_formats 2
num_output_audio_formats 2

Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
}
]

Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
]

Object.Control.bytes."1" {
IncludeByKey.DMIC0_DAI_EQIIR {
"passthrough" "include/components/eqiir/passthrough.conf"
"highpass_40hz_0db" "include/components/eqiir/highpass_40hz_0db_48khz.conf"
"highpass_40hz_20db" "include/components/eqiir/highpass_40hz_20db_48khz.conf"
}
}
}

gain."1" {
num_input_audio_formats 2
num_input_pins 1
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_bit_depth 32
in_valid_bit_depth 32
in_channels 4
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
}
]

num_output_audio_formats 2
num_output_pins 1
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_bit_depth 32
out_valid_bit_depth 32
out_channels 4
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
]
}

module-copier."2" {
num_input_audio_formats 2
num_output_audio_formats 2
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
{
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
}
]

Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
{
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
]
}

pipeline."1" {
priority 0
lp_mode 0
}
}

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

direction "capture"
dynamic_pipeline 1
time_domain "timer"
}
Loading