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

topology: sof: use pipeline ID in demux control name 

To make multiple DEMUX comp can work in same topology. Add pipeline
ID into the DEMUX control name.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
This commit is contained in:
Pan Xiuli 2020-07-27 16:04:43 +08:00 committed by Keyon Jie
parent 35d9034090
commit 73cf4c0bc7
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/topology/sof-apl-demux-pcm512x.m4
View File

@ -49,7 +49,7 @@ define(matrix2, `ROUTE_MATRIX(5,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))
#
# Define the pipelines

2
tools/topology/sof-cml-demux-rt5682.m4
View File

@ -49,7 +49,7 @@ define(matrix2, `ROUTE_MATRIX(5,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))
#
# Define the pipelines

2
tools/topology/sof-icl-rt711-rt1308-rt715-hdmi.m4
View File

@ -51,7 +51,7 @@ define(matrix2, `ROUTE_MATRIX(4,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_3, 2, LIST(` ', `matrix1,', `matrix2'))
')
#

2
tools/topology/sof-tgl-max98357a-rt5682.m4
View File

@ -52,7 +52,7 @@ define(matrix2, `ROUTE_MATRIX(9,
`BITS_TO_BYTE(0, 0, 0 ,0 ,0 ,0 ,0 ,1)')')
dnl name, num_streams, route_matrix list
MUXDEMUX_CONFIG(demux_priv, 2, LIST(` ', `matrix1,', `matrix2'))
MUXDEMUX_CONFIG(demux_priv_1, 2, LIST(` ', `matrix1,', `matrix2'))
#
# Define the pipelines

7
tools/topology/sof/pipe-volume-demux-playback.m4
View File

@ -23,13 +23,12 @@ include(`mixercontrol.m4')
include(`bytecontrol.m4')
# demux Bytes control with max value of 255
C_CONTROLBYTES(DEMUX, PIPELINE_ID,
C_CONTROLBYTES(concat(`DEMUX', PIPELINE_ID), PIPELINE_ID,
CONTROLBYTES_OPS(bytes, 258 binds the mixer control to bytes get/put handlers, 258, 258),
CONTROLBYTES_EXTOPS(258 binds the mixer control to bytes get/put handlers, 258, 258),
, , ,
CONTROLBYTES_MAX(, 304),
,
demux_priv)
, concat(`demux_priv_', PIPELINE_ID))
# Volume Mixer control with max value of 32
C_CONTROLMIXER(Master Playback Volume, PIPELINE_ID,
@ -64,7 +63,7 @@ W_PGA(1, PIPELINE_FORMAT, DAI_PERIODS, 2, playback_pga_conf, SCHEDULE_CORE,
# Mux 0 has 2 sink and source periods.
W_MUXDEMUX(0, 1, PIPELINE_FORMAT, 2, 2, SCHEDULE_CORE,
LIST(` ', "DEMUX"))
LIST(` ', concat(`DEMUX', PIPELINE_ID)))
# Low Latency Buffers
W_BUFFER(0, COMP_BUFFER_SIZE(2,