Skip to content

Commit 12e37b9

Browse files
committed
topology2: tplg-targets-sdca-generic: add echo ref to jack and amp
topologies Add echo reference support to the jack and amp function topologies. The function topologies will be loaded with the jack -> amp order. So always create the "Loopback_Virtual" DAI copier in the jack function topology and there are 2 versions of amp function topologies. One is with the "Loopback_Virtual" DAI copier and the other doesn't. The Linux driver will select the one with "Loopback_Virtual" DAI copier if no jack function is loaded and select the one without "Loopback_Virtual" DAI copier otherwise. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
1 parent 7678ed5 commit 12e37b9

File tree

1 file changed

+25
-5
lines changed

1 file changed

+25
-5
lines changed

tools/topology/topology2/production/tplg-targets-sdca-generic.cmake

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,43 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
99

1010
# Split topologies
1111
"cavs-sdw\;sof-sdca-jack-id0\;SDW_JACK_OUT_STREAM=Playback-SimpleJack,\
12-
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0"
12+
SDW_JACK_IN_STREAM=Capture-SimpleJack,NUM_HDMIS=0,SDW_ECHO_REF_DAI=true,SDW_JACK_ECHO_REF=true"
1313

1414
"cavs-sdw\;sof-sdca-1amp-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
1515
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
16-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
16+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
1717

1818
"cavs-sdw\;sof-sdca-2amp-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
1919
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
20-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
20+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
2121

2222
"cavs-sdw\;sof-sdca-3amp-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\
2323
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
24-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
24+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
2525

2626
"cavs-sdw\;sof-sdca-4amp-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\
2727
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
28-
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true"
28+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
29+
30+
"cavs-sdw\;sof-sdca-1amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=1,SDW_JACK=false,\
31+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
32+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
33+
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
34+
35+
"cavs-sdw\;sof-sdca-2amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=2,SDW_JACK=false,\
36+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
37+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
38+
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
39+
40+
"cavs-sdw\;sof-sdca-3amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=3,SDW_JACK=false,\
41+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
42+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
43+
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
44+
45+
"cavs-sdw\;sof-sdca-4amp-ref_dai-id2\;NUM_SDW_AMP_LINKS=4,SDW_JACK=false,\
46+
SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,NUM_HDMIS=0,\
47+
DEEPBUFFER_FW_DMA_MS=10,DEEP_BUF_SPK=true,SDW_ECHO_REF_DAI=true,\
48+
JACK_RATE=48000,SDW_SPK_ECHO_REF=true"
2949

3050
"cavs-sdw\;sof-sdca-mic-id4\;SDW_JACK=false,SDW_DMIC=1,NUM_HDMIS=0,\
3151
SDW_DMIC_STREAM=Capture-SmartMic"

0 commit comments

Comments
 (0)