Skip to content

topology2: add multiple capture support with DMIC in nocodec path #6783

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

Merged
lgirdwood merged 5 commits into from
Feb 7, 2023
Merged

topology2: add multiple capture support with DMIC in nocodec path #6783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96bf9b9
topology2: add gain and copier in DMIC0 pipeline
RanderWang Dec 14, 2022
29aa56e
topology2: add support for simplified copier module
lyakh Jan 4, 2023
3acde7b
topology2: add second capture stream for DMIC0
RanderWang Dec 14, 2022
1d19080
topology2: remove a superfluous copier in nocodec
lyakh Jan 4, 2023
db974a4
topology2: nocodec: add a second level copier
lyakh Jan 5, 2023
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
244 changes: 239 additions & 5 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@
<host-copier-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<dai-copier-gain-module-copier-capture.conf>
<gain-module-copier.conf>
<gain-capture.conf>
<gain-copier-capture.conf>
<deepbuffer-playback.conf>
<data.conf>
<pcm.conf>
Expand All @@ -43,11 +45,13 @@ Define {
# override DMIC default definitions
DMIC0_HOST_PIPELINE_ID 13
DMIC0_DAI_PIPELINE_ID 14
DMIC0_HOST_PIPELINE_SINK 'copier.host.13.1'
DMIC0_DAI_PIPELINE_SRC 'copier.DMIC.14.1'
DMIC0_HOST_PIPELINE_SINK 'gain.13.1'
DMIC0_DAI_PIPELINE_SRC 'copier.module.14.2'
DMIC0_DAI_COPIER 'copier.DMIC.14.1'
DMIC0_DAI_GAIN 'gain.14.1'
DMIC0_NAME 'NoCodec-6'
DMIC1_NAME 'NoCodec-7'
DMIC0_PCM_CAPS 'Passthrough Capture 13'
DMIC0_PCM_CAPS 'Gain Capture 13'
DMIC1_PCM_CAPS 'DMIC1 WOV Capture'
PLATFORM "none"
DEEP_BUFFER_PIPELINE_ID 15
Expand Down Expand Up @@ -241,7 +245,7 @@ Object.Pipeline {
}

# capture pipelines
gain-capture.1 {
gain-copier-capture.1 {
index 7

Object.Widget.copier.1 {
Expand All @@ -254,7 +258,7 @@ Object.Pipeline {
}
}

gain-capture.4 {
gain-copier-capture.4 {
index 17
format s32le
Object.Widget.copier.1 {
Expand All @@ -267,6 +271,68 @@ Object.Pipeline {
}
}

gain-module-copier.1 {
index 19
direction "capture"
Object.Widget.pipeline.1 {
stream_name $DMIC0_DAI_COPIER
}
Object.Widget.copier.1 {
stream_name 'Gain Capture 19'
num_audio_formats 2
num_sink_audio_formats 2
num_source_audio_formats 2
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
}
Object.Base.audio_format.2 {
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
}
Object.Widget.gain.1 {
num_audio_formats 2
num_sink_audio_formats 2
num_source_audio_formats 2
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
}
Object.Base.audio_format.2 {
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'Main Capture Volume 3'
}
}
}

dai-copier-gain-module-copier-capture.4 {
index 8
Object.Widget.copier."1" {
Expand Down Expand Up @@ -359,6 +425,130 @@ Object.Pipeline {
}
}
}

gain-capture.5 {
format $FORMAT
index 18
Object.Widget.pipeline.1 {
stream_name "DMIC0 Raw"
}
Object.Widget.copier.1 {
stream_name "Gain Capture 18"
num_audio_formats 2
num_sink_audio_formats 2
num_source_audio_formats 2
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
}
Object.Base.audio_format.2 {
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
}
Object.Widget.gain.1 {
num_audio_formats 2
num_sink_audio_formats 2
num_source_audio_formats 2
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
}
Object.Base.audio_format.2 {
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'Capture Raw Volume 1'
}
}
}

gain-capture.6 {
format $FORMAT
index 20
Object.Widget.pipeline.1 {
stream_name "DMIC0 Raw 2"
}
Object.Widget.copier.1 {
stream_name "Gain Capture 20"
num_audio_formats 2
num_sink_audio_formats 2
num_source_audio_formats 2
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
}
Object.Base.audio_format.2 {
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
}
Object.Widget.gain.1 {
num_audio_formats 2
num_sink_audio_formats 2
num_source_audio_formats 2
Object.Base.audio_format.1 {
in_bit_depth 32
in_valid_bit_depth 32
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
}
Object.Base.audio_format.2 {
in_channels 4
in_bit_depth 32
in_valid_bit_depth 32
out_channels 4
out_bit_depth 32
out_valid_bit_depth 32
dma_buffer_size "$[$ibs * 2]"
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
in_ch_map $CHANNEL_MAP_3_POINT_1
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
out_ch_map $CHANNEL_MAP_3_POINT_1
}
Object.Control.mixer.1 {
name 'Capture Raw Volume 2'
}
}
}
}

Object.PCM {
Expand Down Expand Up @@ -434,6 +624,36 @@ Object.PCM {
formats 'S16_LE,S24_LE,S32_LE'
}
}

pcm.27 {
name "DMIC0 Raw"
id 27
direction "capture"
Object.Base.fe_dai."DMIC0 Raw" {}

Object.PCM.pcm_caps."capture" {
name "Gain Capture 18"
# only 32-bit capture supported now
formats 'S32_LE'
channels_min $NUM_DMICS
channels_max $NUM_DMICS
}
}

pcm.28 {
name "DMIC0 Raw 2"
id 28
direction "capture"
Object.Base.fe_dai."DMIC0 Raw 2" {}

Object.PCM.pcm_caps."capture" {
name "Gain Capture 20"
# only 32-bit capture supported now
formats 'S32_LE'
channels_min $NUM_DMICS
channels_max $NUM_DMICS
}
}
}

Object.Base {
Expand Down Expand Up @@ -490,4 +710,18 @@ Object.Base {
sink "copier.module.17.2"
}

route.12 {
source copier.module.14.2
sink gain.19.1
}

route.13 {
source copier.module.19.1
sink gain.18.1
}

route.14 {
source copier.module.19.1
sink gain.20.1
}
}
10 changes: 7 additions & 3 deletions tools/topology/topology2/cavs-rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
<mixout-gain-dai-copier-playback.conf>
<deepbuffer-playback.conf>
<dai-copier-be.conf>
<dai-copier-gain-module-copier-capture.conf>
<gain-capture.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand Down Expand Up @@ -44,10 +46,12 @@ Define {
DMIC1_ID 2
DMIC0_HOST_PIPELINE_ID 13
DMIC0_DAI_PIPELINE_ID 14
DMIC0_HOST_PIPELINE_SINK 'copier.host.13.1'
DMIC0_DAI_PIPELINE_SRC 'copier.DMIC.14.1'
DMIC0_HOST_PIPELINE_SINK 'gain.13.1'
DMIC0_DAI_PIPELINE_SRC 'copier.module.14.2'
DMIC0_DAI_COPIER 'copier.DMIC.14.1'
DMIC0_DAI_GAIN 'gain.14.1'
DMIC0_NAME 'dmic01'
DMIC0_PCM_CAPS 'Passthrough Capture 13'
DMIC0_PCM_CAPS 'Gain Capture 13'
# override BE link ids
NUM_HDMIS 3
HDMI1_ID 3
Expand Down
11 changes: 8 additions & 3 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<virtual.conf>
<host-copier-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<dai-copier-gain-module-copier-capture.conf>
<gain-capture.conf>
<gain-copier-capture.conf>
<deepbuffer-playback.conf>
<passthrough-playback.conf>
<passthrough-capture.conf>
Expand Down Expand Up @@ -42,12 +45,14 @@ Define {
PDM1_MIC_B_ENABLE 1
DMIC0_HOST_PIPELINE_ID 100
DMIC0_DAI_PIPELINE_ID 101
DMIC0_HOST_PIPELINE_SINK 'copier.host.100.1'
DMIC0_DAI_PIPELINE_SRC 'copier.DMIC.101.1'
DMIC0_HOST_PIPELINE_SINK 'gain.100.1'
DMIC0_DAI_PIPELINE_SRC 'copier.module.101.2'
DMIC0_DAI_COPIER 'copier.DMIC.101.1'
DMIC0_DAI_GAIN 'gain.101.1'
DMIC0_NAME 'dmic01'
DMIC0_ID 4
DMIC1_ID 5
DMIC0_PCM_CAPS 'Passthrough Capture 13'
DMIC0_PCM_CAPS 'Gain Capture 13'
USE_CHAIN_DMA "false"
DEEP_BUFFER_PIPELINE_ID 15
DEEP_BUFFER_PCM_ID 31
Expand Down
4 changes: 0 additions & 4 deletions tools/topology/topology2/include/pipelines/cavs/gain-capture.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@ Class.Pipeline."gain-capture" {

Object.Base {
route."1" {
source "copier.module..2"
sink "gain..1"
}
route."2" {
source "gain..1"
sink "copier.host..1"
}
Expand Down
Loading