Skip to content
Merged
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
2 changes: 1 addition & 1 deletion tools/topology/topology2/cavs-mixin-mixout-hda.conf
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Object.Pipeline {
}
}

passthrough-be.1 {
passthrough-capture-be.1 {
index 4
direction capture

Expand Down
5 changes: 3 additions & 2 deletions tools/topology/topology2/cavs-nocodec-bt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand Down Expand Up @@ -175,7 +176,7 @@ Object.Pipeline {
}
}

passthrough-be.4 {
passthrough-capture-be.4 {
index 6
direction capture
Object.Widget.pipeline.1 {
Expand Down Expand Up @@ -209,7 +210,7 @@ Object.Pipeline {
}
}

passthrough-be.5 {
passthrough-capture-be.5 {
index 10
direction capture
Object.Widget.pipeline.1 {
Expand Down
6 changes: 3 additions & 3 deletions tools/topology/topology2/cavs-nocodec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<tokens.conf>
<virtual.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<dai-kpb-be.conf>
<wov-detect.conf>
<host-copier-gain-mixin-playback.conf>
Expand Down Expand Up @@ -375,7 +375,7 @@ Object.Pipeline {
}
}

passthrough-be.5 {
passthrough-capture-be.5 {
index 10
direction capture

Expand Down Expand Up @@ -404,7 +404,7 @@ Object.Pipeline {
}
}

passthrough-be.6 {
passthrough-capture-be.6 {
index 12
direction capture

Expand Down
3 changes: 2 additions & 1 deletion tools/topology/topology2/cavs-rt5682.conf
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<host-copier-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<deepbuffer-playback.conf>
Expand Down Expand Up @@ -248,7 +249,7 @@ Object.Pipeline {
}
}

passthrough-be.1 {
passthrough-capture-be.1 {
index 6
direction capture

Expand Down
4 changes: 2 additions & 2 deletions tools/topology/topology2/cavs-sdw-src-gain-mixin.conf
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<src-gain-mixin-playback.conf>
<mixout-gain-dai-copier-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand Down Expand Up @@ -114,7 +114,7 @@ Object.Pipeline {
in_bit_depth 32
}
}
passthrough-be.2 {
passthrough-capture-be.2 {
direction "capture"
index 3
copier_type "ALH"
Expand Down
3 changes: 2 additions & 1 deletion tools/topology/topology2/cavs-sdw.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<passthrough-playback.conf>
<passthrough-capture.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand Down Expand Up @@ -179,7 +180,7 @@ Object.Pipeline {
in_bit_depth 32
}
}
passthrough-be.11 {
passthrough-capture-be.11 {
direction "capture"
index 11
copier_type "ALH"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
#
# BE DAI passthrough pipeline for capture
#
# All attributes defined herein are namespaced by alsatplg to
# "Object.Pipeline.passthrough-be-capture.N.attribute_name"
#
# Usage: mixin-playback pipeline object can be instantiated as:
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Oops, copy'n'paste error in the doc, will fix in later version.

Copy link
Member

Choose a reason for hiding this comment

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

Fix incrementally in another PR.

#
# Object.Pipeline.dai-pipeline."N" {
# direction "capture"
# period 1000
# time_domain "timer"
# channels 2
# rate 48000
# }
#
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/audio_format.conf>
<include/components/copier.conf>
<include/components/pipeline.conf>

Class.Pipeline."passthrough-capture-be" {
Copy link
Collaborator

Choose a reason for hiding this comment

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

@kv2019i can we call this 32-bit-capture.conf explicitly?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

@ranj063 well, it's not really limited to 32bit, users can add as many audio formats they want, right?

Copy link
Member

Choose a reason for hiding this comment

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

yeah, lets give users a choice if possible. If not, we can hard code this later.


DefineAttribute."index" {}

<include/pipelines/pipeline-common.conf>

attributes {
!constructor [
"index"
]

unique "instance"
}

Object.Widget {
copier."1" {
type dai_in
num_audio_formats 1
num_input_audio_formats 1
num_output_audio_formats 1

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 "$[$obs * 2]"
}
}

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

time_domain "timer"
dynamic_pipeline 1
channels 2
channels_min 2
channels_max 2
rate 48000
rate_min 48000
rate_max 48000
}
2 changes: 1 addition & 1 deletion tools/topology/topology2/platform/intel/bt-generic.conf
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ Object.Pipeline {
}
}

passthrough-be.6 {
passthrough-capture-be.6 {
index $BT_CP_DAI_PIPELINE_ID
direction "capture"
Object.Widget.pipeline.1 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ IncludeByKey.NUM_SDW_AMPS {
node_type $ALH_LINK_OUTPUT_CLASS
}
}
passthrough-be.$ALH_2ND_SPK_IN_ID {
passthrough-capture-be.$ALH_2ND_SPK_IN_ID {
direction "capture"
index $ALH_2ND_SPK_IN_ID
copier_type "ALH"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Object.Pipeline {
in_bit_depth 32
}
}
passthrough-be.41 {
passthrough-capture-be.41 {
direction "capture"
index 41
copier_type "ALH"
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/sof-hda-generic.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<gain-capture.conf>
<deepbuffer-playback.conf>
<passthrough-be.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand Down