Skip to content

Commit c56cc5f

Browse files
bardliaolgirdwood
authored andcommitted
topology2: usa macro to define the echo reference pipeline id
The Loopback_Virtual DAI's pipeline ID should be either spk echo reference pipeline or jack echo reference pipeline. Use macro to select one of them. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 03b1534 commit c56cc5f

3 files changed

Lines changed: 14 additions & 9 deletions

File tree

tools/topology/topology2/cavs-sdw.conf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,10 @@ IncludeByKey.SDW_ECHO_REF_DAI {
156156
stream_name "Loopback_Virtual"
157157
direction "capture"
158158
type "dai_out"
159-
index 12
159+
IncludeByKey.SDW_SPK_ECHO_REF {
160+
"true" {index $SDW_SPK_ECHO_REF_PIPELINE_ID}
161+
"false" {index $SDW_JACK_ECHO_REF_PIPELINE_ID}
162+
}
160163
dai_index 25
161164
node_type $ALH_LINK_INPUT_CLASS
162165
num_input_audio_formats 1

tools/topology/topology2/platform/intel/sdw-amp-generic.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Define {
1414
SDW_AMP_FEEDBACK true
1515
AMP_PLAYBACK_NAME 'Speaker Playback'
1616
SDW_SPK_ECHO_REF_PCM_ID 12
17+
SDW_SPK_ECHO_REF_PIPELINE_ID 120
1718
}
1819

1920
# include deep buffer config if buffer size is in 1 - 1000 ms.
@@ -1036,7 +1037,7 @@ IncludeByKey.SDW_SPK_ECHO_REF {
10361037
siggen-host-copier-capture [
10371038
{
10381039
direction "capture"
1039-
index 120
1040+
index $SDW_SPK_ECHO_REF_PIPELINE_ID
10401041
Object.Widget.host-copier."1" {
10411042
stream_name "Speaker Echo Reference"
10421043
pcm_id $SDW_SPK_ECHO_REF_PCM_ID
@@ -1064,14 +1065,14 @@ IncludeByKey.SDW_SPK_ECHO_REF {
10641065
Object.Base.route [
10651066
{
10661067
source "alh-copier.Loopback_Virtual.25"
1067-
sink "siggen.120.1"
1068+
sink "siggen.$SDW_SPK_ECHO_REF_PCM_ID.1"
10681069
}
10691070
{
10701071
source "module-copier.21.22"
1071-
sink "siggen.120.1"
1072+
sink "siggen.$SDW_SPK_ECHO_REF_PCM_ID.1"
10721073
}
10731074
{
1074-
source "siggen.120.1"
1075+
source "siggen.$SDW_SPK_ECHO_REF_PCM_ID.1"
10751076
sink "host-copier.$SDW_SPK_ECHO_REF_PCM_ID.capture"
10761077
}
10771078
]

tools/topology/topology2/platform/intel/sdw-jack-generic.conf

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Define {
1212
JACK_CAPTURE_PCM_NAME "Jack In"
1313
JACK_RATE 48000
1414
SDW_JACK_ECHO_REF_PCM_ID 11
15+
SDW_JACK_ECHO_REF_PIPELINE_ID 12
1516
}
1617

1718
#
@@ -743,7 +744,7 @@ IncludeByKey.SDW_JACK_ECHO_REF {
743744
siggen-host-copier-capture [
744745
{
745746
direction "capture"
746-
index 12
747+
index $SDW_JACK_ECHO_REF_PIPELINE_ID
747748
Object.Widget.host-copier."1" {
748749
stream_name "Jack Echo Reference"
749750
pcm_id $SDW_JACK_ECHO_REF_PCM_ID
@@ -827,14 +828,14 @@ IncludeByKey.SDW_JACK_ECHO_REF {
827828
Object.Base.route [
828829
{
829830
source "alh-copier.Loopback_Virtual.25"
830-
sink "siggen.12.1"
831+
sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1"
831832
}
832833
{
833834
source "module-copier.1.12"
834-
sink "siggen.12.1"
835+
sink "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1"
835836
}
836837
{
837-
source "siggen.12.1"
838+
source "siggen.$SDW_JACK_ECHO_REF_PIPELINE_ID.1"
838839
sink "host-copier.$SDW_JACK_ECHO_REF_PCM_ID.capture"
839840
}
840841
]

0 commit comments

Comments
 (0)