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

topology: Add Waves codec to JSL topology 

Modify sof-jsl-rt5682 topology so Waves codec can be added
to playback in case 'WAVES' is defined.
Small refactoring

Signed-off-by: Oleh Titov <Otitov@waves.com>
This commit is contained in:
Oleh Titov 2021-08-11 16:51:11 +03:00 committed by Liam Girdwood
parent 0673877881
commit 691c4e0587
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/topology/topology1/sof-jsl-rt5682.m4
View File

@ -57,29 +57,25 @@ dnl frames, deadline, priority, core)
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
define(ENDPOINT_NAME, `Speakers')
PIPELINE_PCM_ADD(
ifdef(`WAVES', sof/pipe-waves-codec-playback.m4, sof/pipe-volume-playback.m4),
1, 0, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
undefine(ENDPOINT_NAME)
ifdef(`INCLUDE_IIR_EQ',
`
# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-eq-iir-volume-playback.m4,
define(ENDPOINT_NAME, `Headphones')
PIPELINE_PCM_ADD(
ifdef(`WAVES', sof/pipe-waves-codec-playback.m4,
ifdef(`INCLUDE_IIR_EQ', sof/pipe-eq-iir-volume-playback.m4,
sof/pipe-volume-playback.m4)),
2, 1, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
'
,
`
# Low Latency playback pipeline 2 on PCM 1 using max 2 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
2, 1, 2, s32le,
1000, 0, 0,
48000, 48000, 48000)
')
undefine(ENDPOINT_NAME)
# Low Latency capture pipeline 3 on PCM 1 using max 2 channels of s32le.
# Schedule 48 frames per 1000us deadline on core 0 with priority 0