Skip to content

Use arrays for objects in top-level conf files and included conf files #7113

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
kv2019i merged 2 commits into from
Feb 17, 2023
Merged

Use arrays for objects in top-level conf files and included conf files #7113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ebb2f9c
topology2: Move to using arrays for defining objects
ranj063 Feb 9, 2023
533b303
topology2: Remove duplicate conf files
ranj063 Feb 16, 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
129 changes: 69 additions & 60 deletions tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ IncludeByKey.DEEPBUFFER_FW_DMA_MS{
"[1-1000]" "platform/intel/deep-buffer.conf"
}

Object.Dai {
HDA.0 {
Object.Dai.HDA [
{
name $HDA_ANALOG_DAI_NAME
dai_index 0
id 4
Expand All @@ -25,76 +25,85 @@ Object.Dai {
}
direction duplex
}
}
]

Object.Pipeline {
mixout-gain-efx-dai-copier-playback.0 {
index 2
mixout-gain-efx-dai-copier-playback [
{
index 2

Object.Widget.copier.1 {
stream_name $HDA_ANALOG_DAI_NAME
dai_type "HDA"
copier_type "HDA"
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '2 Main Playback Volume'
Object.Widget.copier.1 {
stream_name $HDA_ANALOG_DAI_NAME
dai_type "HDA"
copier_type "HDA"
}
}
Object.Widget.eqiir.1 {
Object.Control.bytes."1" {
name '2 Main playback Iir Eq'
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '2 Main Playback Volume'
}
}
}
Object.Widget.eqfir.1 {
Object.Control.bytes."1" {
name '2 Main playback Fir Eq'
Object.Widget.eqiir.1 {
Object.Control.bytes."1" {
name '2 Main playback Iir Eq'
}
}
Object.Widget.eqfir.1 {
Object.Control.bytes."1" {
name '2 Main playback Fir Eq'
}
}
}
}
]

host-copier-gain-mixin-playback.0 {
index 1
host-copier-gain-mixin-playback [
{
index 1

Object.Widget.copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
}
Object.Widget.copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
}

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 2nd Playback Volume'
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 2nd Playback Volume'
}
}
}
}
]

passthrough-capture.1 {
index 3
Object.Widget.copier.1 {
stream_name $ANALOG_CAPTURE_PCM
passthrough-capture [
{
index 3
Object.Widget.copier.1 {
stream_name $ANALOG_CAPTURE_PCM
}
}
}
]

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

Object.Widget.copier."1" {
dai_type "HDA"
type "dai_out"
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
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.Widget.copier."1" {
dai_type "HDA"
type "dai_out"
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
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.PCM {
pcm.0 {
Object.PCM.pcm [
{
id 0
name 'HDA Analog'
Object.Base.fe_dai.1 {
Expand All @@ -112,20 +121,20 @@ Object.PCM {
}
direction duplex
}
}
]

# top-level pipeline connections
Object.Base {
route.1 {
Object.Base.route [
{
sink 'copier.HDA.2.1'
source 'eqfir.2.1'
}
route.2 {
{
source 'mixin.1.1'
sink 'mixout.2.1'
}
route.3 {
{
source 'copier.HDA.4.1'
sink 'copier.host.3.1'
}
}
]
113 changes: 61 additions & 52 deletions tools/topology/topology2/cavs-mixin-mixout-hda.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ IncludeByKey.DEEPBUFFER_FW_DMA_MS{
"[1-1000]" "platform/intel/deep-buffer.conf"
}

Object.Dai {
HDA.0 {
Object.Dai.HDA [
{
name $HDA_ANALOG_DAI_NAME
dai_index 0
id 4
Expand All @@ -25,66 +25,75 @@ Object.Dai {
}
direction duplex
}
}
]

Object.Pipeline {
mixout-gain-dai-copier-playback.0 {
index 2
mixout-gain-dai-copier-playback [
{
index 2

Object.Widget.copier.1 {
stream_name $HDA_ANALOG_DAI_NAME
dai_type "HDA"
copier_type "HDA"
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '2 Main Playback Volume'
Object.Widget.copier.1 {
stream_name $HDA_ANALOG_DAI_NAME
dai_type "HDA"
copier_type "HDA"
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '2 Main Playback Volume'
}
}
}
}
]

host-copier-gain-mixin-playback.0 {
index 1
host-copier-gain-mixin-playback [
{
index 1

Object.Widget.copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
}
Object.Widget.copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
}

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 2nd Playback Volume'
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 2nd Playback Volume'
}
}
}
}
]

passthrough-capture.1 {
index 3
Object.Widget.copier.1 {
stream_name $ANALOG_CAPTURE_PCM
passthrough-capture [
{
index 3
Object.Widget.copier.1 {
stream_name $ANALOG_CAPTURE_PCM
}
}
}
]

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

Object.Widget.copier."1" {
dai_type "HDA"
type "dai_out"
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
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.Widget.copier."1" {
dai_type "HDA"
type "dai_out"
copier_type "HDA"
stream_name $HDA_ANALOG_DAI_NAME
node_type $HDA_LINK_INPUT_CLASS
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.PCM {
pcm.0 {
Object.PCM.pcm [
{
id 0
name 'HDA Analog'
Object.Base.fe_dai.1 {
Expand All @@ -102,20 +111,20 @@ Object.PCM {
}
direction duplex
}
}
]

# top-level pipeline connections
Object.Base {
route.1 {
Object.Base.route [
{
sink 'copier.HDA.2.1'
source 'gain.2.1'
}
route.2 {
{
source 'mixin.1.1'
sink 'mixout.2.1'
}
route.3 {
{
source 'copier.HDA.4.1'
sink 'copier.host.3.1'
}
}
]
Loading