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

topology: define PIPELINE_FORMAT from DAI_ADD 

Pipeline extects PIPELINE_FORMAT to be defined. When including a
pipeline using DAI_ADD, DAI_FORMAT is defined but no PIPELINE_FORMAT.
Prior c687815, the last previously defined PIPELINE_FORMAT was used.
This change ensure the requested DAI_FORMAT is used in the pipeline.

This addresses bug #5193.

Signed-off-by: Lionel Koenig <lionelk@google.com>
This commit is contained in:
Lionel Koenig 2022-01-12 09:26:02 +01:00 committed by Michal Wasko
parent 83373eb970
commit 7162534498
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/topology/topology1/m4/dai.m4
View File

@ -271,6 +271,7 @@ define(`DAI_ADD',
`define(`DAI_CHANNELS', $13)'
`define(`DAI_RATE', $14)'
`define(`DYNAMIC_PIPE', $15)'
`define(`PIPELINE_FORMAT', $8)'
`include($1)'
`DEBUG_DAI($3, $4)'
`undefine(`PIPELINE_ID')'
@ -287,6 +288,7 @@ define(`DAI_ADD',
`undefine(`DAI_CHANNELS')'
`undefine(`DAI_RATE')'
`undefine(`DYNAMIC_PIPE')'
`undefine(`PIPELINE_FORMAT')'
)
# DAI_ADD_SCHED can be used for adding a DAI with sched_comp