Skip to content

Topology2: fix soundwire audio formats #9328

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 3 commits into from
Aug 5, 2024
Merged

Topology2: fix soundwire audio formats #9328

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3738de1
topology2: remove audio_format
plbossart Jul 24, 2024
61595d0
topology2: revisit use of SAMPLE_TYPE_MSB_INTEGER and SDW_LINK_VALID_…
plbossart Jul 24, 2024
f7b3101
topology2: sdw-jack-generic: simplify capture formats
plbossart Jul 24, 2024
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
237 changes: 0 additions & 237 deletions tools/topology/topology2/include/common/audio_format.conf
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/audio_format.conf>
<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/components/dai-copier.conf>
<include/components/pipeline.conf>
<include/components/kpb.conf>
Expand Down
3 changes: 2 additions & 1 deletion tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@

<include/components/dai-copier.conf>
<include/components/pipeline.conf>
<include/common/audio_format.conf>
<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/components/google-rtc-aec.conf>
<include/controls/bytes.conf>

Expand Down
1 change: 0 additions & 1 deletion tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/audio_format.conf>
<include/components/alh-dai-copier.conf>
<include/components/gain.conf>
<include/components/mixout.conf>
Expand Down
51 changes: 36 additions & 15 deletions .../topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-dai-copier-playback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/audio_format.conf>
<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/components/dai-copier.conf>
<include/components/gain.conf>
<include/components/mixout.conf>
Expand Down Expand Up @@ -54,10 +55,14 @@ Class.Pipeline."mixout-gain-eqiir-dts-dai-copier-playback" {
num_input_pins 1

# copier only supports one format based on mixin/mixout requirements: 32-bit 48KHz 2ch
Object.Base.audio_format [
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
}
Expand All @@ -68,10 +73,14 @@ Class.Pipeline."mixout-gain-eqiir-dts-dai-copier-playback" {
num_output_audio_formats 1

# 32-bit 48KHz 2ch
Object.Base.audio_format [
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
}
Expand All @@ -81,12 +90,18 @@ Class.Pipeline."mixout-gain-eqiir-dts-dai-copier-playback" {
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
}
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" {
<include/components/eqiir/flat.conf>
Expand All @@ -96,12 +111,18 @@ Class.Pipeline."mixout-gain-eqiir-dts-dai-copier-playback" {
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
}
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
}
]
}

pipeline."1" {
Expand Down
3 changes: 2 additions & 1 deletion tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/audio_format.conf>
<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/components/host-copier.conf>
<include/components/mixout.conf>
<include/components/pipeline.conf>
Expand Down
1 change: 0 additions & 1 deletion tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#
<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/common/audio_format.conf>
<include/components/host-copier.conf>
<include/components/gain.conf>
<include/components/mixin.conf>
Expand Down
3 changes: 2 additions & 1 deletion tools/topology/topology2/include/pipelines/gain-capture.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
# Where N is the unique pipeline ID within the same alsaconf node.
#

<include/common/audio_format.conf>
<include/common/input_audio_format.conf>
<include/common/output_audio_format.conf>
<include/components/host-copier.conf>
<include/components/gain.conf>
<include/components/pipeline.conf>
Expand Down
Loading