Skip to content

Modify the naming convention for the host copier in topology #7631

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
ranj063 merged 12 commits into from
May 19, 2023
Merged

Modify the naming convention for the host copier in topology #7631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
ac0a2d5
topology2: components: Add a new class definition for the host copier…
ranj063 May 16, 2023
9a4618c
topology2: host-copier-gain-mixin-playback: Use host-copier
ranj063 May 16, 2023
36bcad5
topology2: host-copier-gain-src-mixin-playback: Use host-copier
ranj063 May 16, 2023
bafb9c1
topology2: src-gain-mixin-playback: Use host-copier
ranj063 May 16, 2023
0ee388b
topology2: deepbuffer-playback: Use host-copier
ranj063 May 16, 2023
b00102a
topology2: mixout-gain-host-copier-capture: Use host-copier
ranj063 May 16, 2023
cdc01ff
topology2: gain-capture: Use host-copier
ranj063 May 16, 2023
75b4548
topology2: gain-playback: Use host-copier
ranj063 May 16, 2023
38ec489
topology2: gain-copier-capture: Use host-copier
ranj063 May 16, 2023
2380f93
topology2: host-gateway-capture: use host-copier
ranj063 May 16, 2023
a5d4afc
topology2: host-gateway-playback: Use host-copier
ranj063 May 16, 2023
1de2209
topology2: copier: Remove host gateway type support
ranj063 May 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
12 changes: 9 additions & 3 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 @@ -60,8 +60,9 @@ Object.Pipeline {
{
index 1

Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
pcm_id 0
}

Object.Widget.gain.1 {
Expand All @@ -75,8 +76,9 @@ Object.Pipeline {
host-gateway-capture [
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_CAPTURE_PCM
pcm_id 0
}
}
]
Expand Down Expand Up @@ -135,6 +137,10 @@ Object.Base.route [
}
{
source 'copier.HDA.4.1'
sink 'copier.host.3.1'
sink 'host-copier.0.capture'
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
Comment thread
bardliao marked this conversation as resolved.
Outdated
]
12 changes: 9 additions & 3 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 @@ -50,8 +50,9 @@ Object.Pipeline {
{
index 1

Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_PLAYBACK_PCM
pcm_id 0
}

Object.Widget.gain.1 {
Expand All @@ -65,8 +66,9 @@ Object.Pipeline {
host-gateway-capture [
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $ANALOG_CAPTURE_PCM
pcm_id 0
}
}
]
Expand Down Expand Up @@ -134,6 +136,10 @@ Object.Base.route [
}
{
source 'eqiir.4.1'
sink 'copier.host.3.1'
sink 'host-copier.0.capture'
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
]
20 changes: 12 additions & 8 deletions tools/topology/topology2/cavs-nocodec-bt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,17 +161,19 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Playback'
pcm_id 0
}
}
{
index 3
Object.Widget.pipeline.1 {
stream_name 'NoCodec-1'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Playback'
pcm_id 1
}
}
]
Expand All @@ -183,17 +185,19 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name 'NoCodec-0'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id 0
}
}
{
index 9
Object.Widget.pipeline.1 {
stream_name 'NoCodec-1'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Capture'
pcm_id 1
}
}
]
Expand Down Expand Up @@ -291,20 +295,20 @@ Object.PCM.pcm [

Object.Base.route [
{
source "copier.host.1.1"
source "host-copier.0.playback"
sink "copier.SSP.2.1"
}
{
source "copier.host.3.1"
source "host-copier.1.playback"
sink "copier.SSP.4.1"
}
{
source "copier.SSP.6.1"
sink "copier.host.5.1"
sink "host-copier.0.capture"
}
{
source "copier.SSP.10.1"
sink "copier.host.9.1"
sink "host-copier.1.capture"
}
{
source "copier.SSP.12.1"
Expand Down
36 changes: 27 additions & 9 deletions tools/topology/topology2/cavs-nocodec-multicore.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,10 @@ Object.Pipeline.host-copier-gain-mixin-playback [
index 1

core $SSP0_CORE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
core_id $SSP0_CORE_ID
stream_name 'SSP0 Playback'
pcm_id 0
}
Object.Widget.gain.1 {
core_id $SSP0_CORE_ID
Expand All @@ -135,9 +136,10 @@ Object.Pipeline.host-copier-gain-mixin-playback [
index 5

core $SSP2_CORE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
core_id $SSP2_CORE_ID
stream_name 'SSP2 Playback'
pcm_id 2
}
Object.Widget.gain.1 {
core_id $SSP2_CORE_ID
Expand Down Expand Up @@ -201,15 +203,17 @@ Object.Pipeline.host-gateway-capture [
{
index 7

Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id 0
}
}
{
index 11

Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP2 Capture'
pcm_id 2
}
}
]
Expand Down Expand Up @@ -317,11 +321,19 @@ Object.Base.route [
}
{
source "copier.SSP.8.1"
sink "copier.host.7.1"
sink "host-copier.0.capture"
}
{
source "copier.SSP.12.1"
sink "copier.host.11.1"
sink "host-copier.2.capture"
}
{
source 'host-copier.0.playback'
sink 'gain.1.1'
}
{
source 'host-copier.2.playback'
sink 'gain.5.1'
}
]

Expand Down Expand Up @@ -358,9 +370,10 @@ IncludeByKey.SSP1_ENABLED {
index 3

core $SSP1_CORE_ID
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
core_id $SSP1_CORE_ID
stream_name 'SSP1 Playback'
pcm_id 1
}
Object.Widget.gain.1 {
core_id $SSP1_CORE_ID
Expand Down Expand Up @@ -404,8 +417,9 @@ IncludeByKey.SSP1_ENABLED {
{
index 9

Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Capture'
pcm_id 1
}
}
]
Expand Down Expand Up @@ -466,7 +480,11 @@ IncludeByKey.SSP1_ENABLED {
}
{
source "copier.SSP.10.1"
sink "copier.host.9.1"
sink "host-copier.1.capture"
}
{
source 'host-copier.1.playback'
sink 'gain.3.1'
}
]
}
Expand Down
Loading