Skip to content

Commit 5df8e47

Browse files
singalsuabonislawski
singalsu
authored and
abonislawski
committed
Tools: Topology: Add echo reference for SDW speaker and jack
This patch adds an echo reference capture PCM for speaker and jack playback. The additions are normally disabled but can be enabled with build options SDW_JACK_ECHO_REF=true and/or SDW_SPK_ECHO_REF=true. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent f349324 commit 5df8e47

5 files changed

Lines changed: 449 additions & 41 deletions

File tree

‎tools/topology/topology2/cavs-sdw.conf‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
<ssp.conf>
5252
<bt-default.conf>
5353
<deep-buffer-default.conf>
54+
<siggen-host-copier-capture.conf>
5455

5556
Define {
5657
PLATFORM "none"

‎tools/topology/topology2/include/common/common_definitions.conf‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,6 @@ Define {
6969
SSP_BLOB_VERSION_3_0 0x300
7070

7171
PCM_FORMAT_ALL false # Basic s16/s24/s32, no float, 8-bit etc.
72+
SDW_JACK_ECHO_REF false # No echo reference for 3.5mm jack
73+
SDW_SPK_ECHO_REF false # No echo reference for speaker
7274
}

‎tools/topology/topology2/include/pipelines/cavs/siggen-host-copier-capture.conf‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
#
2+
# Siggen capture pipeline
3+
#
4+
# This class provides host pipeline for capture with siggen input. All
5+
# attributes defined herein are namespaced by alsatplg to
6+
# "Object.Pipeline.siggen-host-copier-capture.N.attribute_name".
7+
#
8+
# Usage: siggen-host-copier-capture pipeline object can be instantiated as:
9+
#
10+
# Object.Pipeline.siggen-host-copier-capture."N" {
11+
# period 1000
12+
# time_domain "timer"
13+
# }
14+
#
15+
# Where N is the unique pipeline ID within the same alsaconf node.
16+
#
17+
18+
<include/common/input_audio_format.conf>
19+
<include/common/output_audio_format.conf>
20+
<include/components/pipeline.conf>
21+
<include/components/host-copier.conf>
22+
<include/components/siggen.conf>
23+
24+
Class.Pipeline."siggen-host-copier-capture" {
25+
26+
<include/pipelines/pipeline-common.conf>
27+
28+
attributes {
29+
!constructor [
30+
"index"
31+
]
32+
33+
#
34+
# siggen-host-copier-capture objects instantiated within the same alsaconf
35+
# node must have unique pipeline_id attribute
36+
#
37+
unique "instance"
38+
}
39+
40+
Object.Widget {
41+
siggen."1" {
42+
num_input_pins 1
43+
num_output_pins 1
44+
num_input_audio_formats 1
45+
num_output_audio_formats 1
46+
Object.Base.input_audio_format [
47+
{
48+
in_bit_depth 32
49+
in_valid_bit_depth 32
50+
}
51+
]
52+
Object.Base.output_audio_format [
53+
{
54+
out_bit_depth 32
55+
out_valid_bit_depth 32
56+
}
57+
]
58+
}
59+
60+
host-copier."1" {
61+
type "aif_out"
62+
node_type $HDA_HOST_INPUT_CLASS
63+
num_input_pins 1
64+
num_output_pins 1
65+
num_input_audio_formats 1
66+
num_output_audio_formats 3
67+
Object.Base.input_audio_format [
68+
{
69+
in_bit_depth 32
70+
in_valid_bit_depth 32
71+
}
72+
]
73+
Object.Base.output_audio_format [
74+
{
75+
out_bit_depth 16
76+
out_valid_bit_depth 16
77+
}
78+
{
79+
out_bit_depth 32
80+
out_valid_bit_depth 24
81+
}
82+
{
83+
out_bit_depth 32
84+
out_valid_bit_depth 32
85+
}
86+
]
87+
}
88+
89+
pipeline."1" {
90+
priority 0
91+
lp_mode 0
92+
}
93+
}
94+
95+
direction "capture"
96+
dynamic_pipeline 1
97+
time_domain "timer"
98+
}

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

Lines changed: 165 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Define {
1313
AMP_FEEDBACK_CH_PER_LINK 2
1414
SDW_AMP_FEEDBACK true
1515
AMP_PLAYBACK_NAME 'Speaker Playback'
16+
SDW_SPK_ECHO_REF_PCM_ID 12
1617
}
1718

1819
Object.Dai.ALH [
@@ -642,44 +643,76 @@ Object.PCM.pcm [
642643
]
643644

644645
IncludeByKey.PASSTHROUGH {
645-
"false" {
646-
IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
647-
"true" {
648-
Object.Base.route [
649-
{
650-
source "drc.21.1"
651-
sink "alh-copier.$SDW_SPK_STREAM.0"
652-
}
653-
]
654-
}
655-
"false" {
656-
Object.Base.route [
657-
{
658-
source "gain.21.1"
659-
sink "alh-copier.$SDW_SPK_STREAM.0"
660-
}
661-
]
662-
}
663-
}
664-
Object.Base.route [
665-
{
666-
source 'mixin.20.1'
667-
sink 'mixout.21.1'
668-
}
669-
{
670-
source 'host-copier.2.playback'
671-
sink 'gain.20.1'
672-
}
673-
]
674-
}
675-
"true" {
676-
Object.Base.route [
677-
{
678-
source "host-copier.2.playback"
679-
sink "alh-copier.$SDW_SPK_STREAM.0"
646+
"false" {
647+
IncludeByKey.SDW_SPK_ECHO_REF {
648+
"true" {
649+
IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
650+
"true" {
651+
Object.Base.route [
652+
{
653+
source "drc.21.1"
654+
sink "module-copier.21.22"
655+
}
656+
{
657+
source "module-copier.21.22"
658+
sink "alh-copier.$SDW_SPK_STREAM.0"
659+
}
660+
]
661+
}
662+
"false" {
663+
Object.Base.route [
664+
{
665+
source "gain.21.1"
666+
sink "module-copier.21.22"
667+
}
668+
{
669+
source "module-copier.21.22"
670+
sink "alh-copier.$SDW_SPK_STREAM.0"
671+
}
672+
]
673+
}
674+
}
675+
}
676+
"false" {
677+
IncludeByKey.SDW_SPK_ENHANCED_PLAYBACK {
678+
"true" {
679+
Object.Base.route [
680+
{
681+
source "drc.21.1"
682+
sink "alh-copier.$SDW_SPK_STREAM.0"
683+
}
684+
]
685+
}
686+
"false" {
687+
Object.Base.route [
688+
{
689+
source "gain.21.1"
690+
sink "alh-copier.$SDW_SPK_STREAM.0"
691+
}
692+
]
693+
}
694+
}
695+
}
680696
}
681-
]
682-
}
697+
Object.Base.route [
698+
{
699+
source 'mixin.20.1'
700+
sink 'mixout.21.1'
701+
}
702+
{
703+
source 'host-copier.2.playback'
704+
sink 'gain.20.1'
705+
}
706+
]
707+
}
708+
"true" {
709+
Object.Base.route [
710+
{
711+
source "host-copier.2.playback"
712+
sink "alh-copier.$SDW_SPK_STREAM.0"
713+
}
714+
]
715+
}
683716
}
684717

685718
IncludeByKey.SDW_AMP_FEEDBACK {
@@ -891,3 +924,98 @@ IncludeByKey.SDW_AMP_FEEDBACK {
891924
]
892925
}
893926
}
927+
928+
IncludeByKey.SDW_SPK_ECHO_REF {
929+
"true" {
930+
Object.Widget.alh-copier [
931+
{
932+
stream_name "Loopback_Virtual"
933+
direction "capture"
934+
type "dai_out"
935+
index 22
936+
dai_index 25
937+
node_type $ALH_LINK_INPUT_CLASS
938+
num_input_audio_formats 1
939+
num_output_audio_formats 1
940+
Object.Base.input_audio_format [
941+
{
942+
in_bit_depth 32
943+
in_valid_bit_depth $SDW_LINK_VALID_BITS
944+
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
945+
in_fmt_cfg "$[($in_channels | ($in_valid_bit_depth * 256))]"
946+
}
947+
]
948+
Object.Base.output_audio_format [
949+
{
950+
out_bit_depth 32
951+
out_valid_bit_depth 32
952+
}
953+
]
954+
}
955+
]
956+
957+
Object.Widget.module-copier."22" {
958+
index 21
959+
num_input_pins 1
960+
num_output_pins 2
961+
num_input_audio_formats 1
962+
num_output_audio_formats 1
963+
Object.Base.input_audio_format [
964+
{
965+
in_bit_depth 32
966+
in_valid_bit_depth 32
967+
}
968+
]
969+
Object.Base.output_audio_format [
970+
{
971+
out_bit_depth 32
972+
out_valid_bit_depth 32
973+
}
974+
]
975+
}
976+
977+
Object.Pipeline {
978+
siggen-host-copier-capture [
979+
{
980+
direction "capture"
981+
index 22
982+
Object.Widget.host-copier."1" {
983+
stream_name "Speaker Echo Reference"
984+
pcm_id $SDW_SPK_ECHO_REF_PCM_ID
985+
}
986+
Object.Widget.siggen."1" {}
987+
}
988+
]
989+
}
990+
991+
Object.PCM.pcm [
992+
{
993+
name "Speaker Echo Reference"
994+
id $SDW_SPK_ECHO_REF_PCM_ID
995+
direction "capture"
996+
Object.Base.fe_dai.1 {
997+
name "Speaker Echo Reference"
998+
}
999+
Object.PCM.pcm_caps.1 {
1000+
name "Speaker Echo Reference"
1001+
formats 'S16_LE,S24_LE,S32_LE'
1002+
}
1003+
}
1004+
]
1005+
1006+
Object.Base.route [
1007+
{
1008+
source "alh-copier.Loopback_Virtual.25"
1009+
sink "siggen.22.1"
1010+
}
1011+
{
1012+
source "module-copier.21.22"
1013+
sink "siggen.22.1"
1014+
}
1015+
{
1016+
source "siggen.22.1"
1017+
sink "host-copier.$SDW_SPK_ECHO_REF_PCM_ID.capture"
1018+
}
1019+
]
1020+
} # SDW_SPK_ECHO_REF true
1021+
}

0 commit comments

Comments
 (0)