Skip to content

Commit ee729a7

Browse files
committed
topology2: Add new sof-hda-generic-compr.tplg with compressed support
The compr pipeline will connect to `mixout.2.1` if COMPRESSED is set to true. Normal PCM, DeepBuffer and Compr can be used concurrently to play audio. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent 88ac757 commit ee729a7

File tree

3 files changed

+15
-0
lines changed

3 files changed

+15
-0
lines changed

tools/topology/topology2/cavs-mixin-mixout-hda.conf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,29 @@ Define {
99
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'
1010
DEEP_BUFFER_PIPELINE_SINK 'mixout.2.1'
1111
DEEP_BUFFER_PCM_NAME 'Deepbuffer HDA Analog'
12+
COMPR_PIPELINE_ID 20
13+
COMPR_PCM_ID 50
14+
COMPR_PIPELINE_SRC 'mixin.20.1'
15+
COMPR_PIPELINE_SINK 'mixout.2.1'
16+
COMPR_PCM_NAME 'Compr HDA Analog'
1217
HDA_ANALOG_CAPTURE_RATE 48000
1318
HDA_ANALOG_PLAYBACK_RATE 48000
1419
EFX_FIR_PARAMS 'passthrough'
1520
EFX_IIR_PARAMS 'passthrough'
1621
EFX_DRC_PARAMS 'passthrough'
1722
HDA_MIC_ENHANCED_CAPTURE 'false'
23+
COMPRESSED 'false'
1824
}
1925

2026
# include deep buffer config if buffer size is in 1 - 1000 ms.
2127
IncludeByKey.DEEPBUFFER_FW_DMA_MS{
2228
"[1-1000]" "platform/intel/deep-buffer.conf"
2329
}
2430

31+
IncludeByKey.COMPRESSED {
32+
"true" "platform/intel/compr.conf"
33+
}
34+
2535
Object.Dai.HDA [
2636
{
2737
name $HDA_ANALOG_DAI_NAME

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ list(APPEND TPLGS
1313
"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,HDA_MIC_ENHANCED_CAPTURE=true,\
1414
EFX_HDA_MIC_TDFB_PARAMS=line2_pass,EFX_HDA_MIC_DRC_PARAMS=passthrough"
1515

16+
"sof-hda-generic\;sof-hda-generic-compr\;HDA_CONFIG=mix,HDA_MIC_ENHANCED_CAPTURE=true,\
17+
EFX_HDA_MIC_TDFB_PARAMS=line2_pass,EFX_HDA_MIC_DRC_PARAMS=passthrough,COMPRESSED=true"
18+
1619
"sof-hda-generic\;sof-hda-generic-dax\;HDA_CONFIG=dax,HDA_MIC_ENHANCED_CAPTURE=true,\
1720
EFX_HDA_MIC_TDFB_PARAMS=line2_pass,EFX_HDA_MIC_DRC_PARAMS=passthrough,DOLBY_DAX_CORE_ID=1"
1821

tools/topology/topology2/sof-hda-generic.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
<gain-capture.conf>
2727
<deepbuffer-playback.conf>
2828
<deepbuffer-capture.conf>
29+
<compr-playback.conf>
2930
<io-gateway.conf>
3031
<io-gateway-capture.conf>
3132
<highpass-capture-be.conf>
@@ -43,6 +44,7 @@
4344
<dmic-default.conf>
4445
<hdmi-default.conf>
4546
<deep-buffer-default.conf>
47+
<compr-default.conf>
4648
<module-copier.conf>
4749

4850
Define {

0 commit comments

Comments
 (0)