OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology2: host-gateway-playback: Use host-copier 

Replace the generic copier with host-copier in the class definition and
the instances.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
This commit is contained in:
Ranjani Sridharan 2023-05-16 14:45:32 -07:00 committed by Ranjani Sridharan
parent ac26e70d95
commit b534fc6192
5 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/topology/topology2/cavs-nocodec-bt.conf
View File

@ -161,8 +161,9 @@ 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
}
}
{
@ -170,8 +171,9 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name 'NoCodec-1'
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Playback'
pcm_id 1
}
}
]
@ -293,11 +295,11 @@ 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"
}
{

15
tools/topology/topology2/cavs-nocodec.conf
View File

@ -476,8 +476,9 @@ IncludeByKey.PASSTHROUGH {
Object.Pipeline.host-gateway-playback [
{
index 1
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Playback'
pcm_id 0
num_input_audio_formats 3
Object.Base.input_audio_format [
{
@ -512,8 +513,9 @@ IncludeByKey.PASSTHROUGH {
}
{
index 5
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP2 Playback'
pcm_id 2
num_input_audio_formats 3
Object.Base.input_audio_format [
{
@ -916,11 +918,11 @@ IncludeByKey.PASSTHROUGH {
sink "host-copier.0.capture"
}
{
source "copier.host.1.1"
source "host-copier.0.playback"
sink "copier.SSP.2.1"
}
{
source "copier.host.5.1"
source "host-copier.2.playback"
sink "copier.SSP.6.1"
}
]
@ -1090,8 +1092,9 @@ IncludeByKey.SSP1_ENABLED {
Object.Pipeline.host-gateway-playback [
{
index 3
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name 'SSP1 Playback'
pcm_id 1
num_input_audio_formats 3
Object.Base.input_audio_format [
{
@ -1171,7 +1174,7 @@ IncludeByKey.SSP1_ENABLED {
"true" {
Object.Base.route [
{
source "copier.host.3.1"
source "host-copier.1.playback"
sink "copier.SSP.4.1"
}
]

6
tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf
View File

@ -16,7 +16,7 @@
# Where N is the unique pipeline ID within the same alsaconf node.
#
<include/components/copier.conf>
<include/components/host-copier.conf>
<include/components/pipeline.conf>
<include/common/audio_format.conf>
@ -43,10 +43,10 @@ Class.Pipeline."host-gateway-playback" {
}
Object.Widget {
copier."1" {
copier_type "host"
host-copier."1" {
node_type $HDA_HOST_OUTPUT_CLASS
type "aif_in"
num_output_pins 1
num_input_audio_formats 3
num_output_audio_formats 3
# 16-bit input format 48KHz 2ch. Output sample format is always 32-bit for playback

5
tools/topology/topology2/platform/intel/bt-generic.conf
View File

@ -62,8 +62,9 @@ Object.Pipeline {
Object.Widget.pipeline.1 {
stream_name $BT_PB_PIPELINE_STREAM_NAME
}
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $BT_PB_PCM_CAPS
pcm_id $BT_PCM_ID
num_input_audio_formats 3
num_output_audio_formats 3
Object.Base.audio_format.0 {
@ -194,7 +195,7 @@ Object.Pipeline {
Object.Base.route [
{
source $BT_PB_DAI_PIPELINE_SRC
source "host-copier.$BT_PCM_ID.playback"
sink $BT_PB_HOST_PIPELINE_SINK
}
{

20
tools/topology/topology2/platform/intel/hdmi-generic.conf
View File

@ -34,24 +34,27 @@ Object.Dai.HDA [
Object.Pipeline {
host-gateway-playback [
{
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $HDMI1_PCM_CAPS
pcm_id $HDMI1_PCM_ID
}
index $HDMI1_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
{
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $HDMI2_PCM_CAPS
pcm_id $HDMI2_PCM_ID
}
index $HDMI2_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
{
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $HDMI3_PCM_CAPS
pcm_id $HDMI3_PCM_ID
}
index $HDMI3_HOST_PIPELINE_ID
@ -178,15 +181,15 @@ Object.PCM.pcm [
# top-level pipeline connections
Object.Base.route [
{
source $HDMI1_HOST_PIPELINE_SINK
source "host-copier.$HDMI1_PCM_ID.playback"
sink $HDMI1_DAI_PIPELINE_SRC
}
{
source $HDMI2_HOST_PIPELINE_SINK
source "host-copier.$HDMI2_PCM_ID.playback"
sink $HDMI2_DAI_PIPELINE_SRC
}
{
source $HDMI3_HOST_PIPELINE_SINK
source "host-copier.$HDMI3_PCM_ID.playback"
sink $HDMI3_DAI_PIPELINE_SRC
}
]
@ -234,8 +237,9 @@ IncludeByKey.NUM_HDMIS {
]
Object.Pipeline.host-gateway-playback [
{
Object.Widget.copier.1 {
Object.Widget.host-copier.1 {
stream_name $HDMI4_PCM_CAPS
pcm_id $HDMI4_PCM_ID
}
index $HDMI4_HOST_PIPELINE_ID
@ -259,7 +263,7 @@ IncludeByKey.NUM_HDMIS {
]
Object.Base.route [
{
source $HDMI4_HOST_PIPELINE_SINK
source "host-copier.$HDMI4_PCM_ID.playback"
sink $HDMI4_DAI_PIPELINE_SRC
}
]