Skip to content

Commit 87ffeed

Browse files
ujfalusiujfalusi
committed
Tools: Topology: Add 7 channel to up/downmix in nocodec
The channel count 7 was somehow missed by the initial commit, which I don't think was on purpose. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent e68dfe9 commit 87ffeed

2 files changed

Lines changed: 99 additions & 3 deletions

File tree

‎tools/topology/topology2/cavs-nocodec.conf‎

Lines changed: 63 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ IncludeByKey.PASSTHROUGH {
225225
Object.Widget.host-copier.1 {
226226
stream_name 'SSP0 Playback'
227227
pcm_id 0
228-
num_input_audio_formats 49
229-
num_output_audio_formats 7
228+
num_input_audio_formats 50
229+
num_output_audio_formats 8
230230

231231
Object.Base.input_audio_format [
232232
{
@@ -271,6 +271,13 @@ IncludeByKey.PASSTHROUGH {
271271
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
272272
in_ch_map $CHANNEL_MAP_5_POINT_1
273273
}
274+
{
275+
in_bit_depth 16
276+
in_valid_bit_depth 16
277+
in_channels 7
278+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
279+
in_ch_map $CHANNEL_MAP_5_POINT_1
280+
}
274281
{
275282
in_bit_depth 16
276283
in_valid_bit_depth 16
@@ -321,6 +328,13 @@ IncludeByKey.PASSTHROUGH {
321328
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
322329
in_ch_map $CHANNEL_MAP_5_POINT_1
323330
}
331+
{
332+
in_bit_depth 32
333+
in_valid_bit_depth 24
334+
in_channels 7
335+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
336+
in_ch_map $CHANNEL_MAP_5_POINT_1
337+
}
324338
{
325339
in_bit_depth 32
326340
in_valid_bit_depth 24
@@ -370,6 +384,13 @@ IncludeByKey.PASSTHROUGH {
370384
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
371385
in_ch_map $CHANNEL_MAP_5_POINT_1
372386
}
387+
{
388+
in_bit_depth 32
389+
in_valid_bit_depth 32
390+
in_channels 7
391+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
392+
in_ch_map $CHANNEL_MAP_5_POINT_1
393+
}
373394
{
374395
in_bit_depth 32
375396
in_valid_bit_depth 32
@@ -425,6 +446,14 @@ IncludeByKey.PASSTHROUGH {
425446
in_ch_map $CHANNEL_MAP_5_POINT_1
426447
in_sample_type $SAMPLE_TYPE_FLOAT
427448
}
449+
{
450+
in_bit_depth 32
451+
in_valid_bit_depth 32
452+
in_channels 7
453+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
454+
in_ch_map $CHANNEL_MAP_5_POINT_1
455+
in_sample_type $SAMPLE_TYPE_FLOAT
456+
}
428457
{
429458
in_bit_depth 32
430459
in_valid_bit_depth 32
@@ -481,6 +510,14 @@ IncludeByKey.PASSTHROUGH {
481510
in_ch_map $CHANNEL_MAP_5_POINT_1
482511
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
483512
}
513+
{
514+
in_bit_depth 8
515+
in_valid_bit_depth 8
516+
in_channels 7
517+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
518+
in_ch_map $CHANNEL_MAP_5_POINT_1
519+
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
520+
}
484521
{
485522
in_bit_depth 8
486523
in_valid_bit_depth 8
@@ -537,6 +574,14 @@ IncludeByKey.PASSTHROUGH {
537574
in_ch_map $CHANNEL_MAP_5_POINT_1
538575
in_sample_type $SAMPLE_TYPE_A_LAW
539576
}
577+
{
578+
in_bit_depth 8
579+
in_valid_bit_depth 8
580+
in_channels 7
581+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
582+
in_ch_map $CHANNEL_MAP_5_POINT_1
583+
in_sample_type $SAMPLE_TYPE_A_LAW
584+
}
540585
{
541586
in_bit_depth 8
542587
in_valid_bit_depth 8
@@ -593,6 +638,14 @@ IncludeByKey.PASSTHROUGH {
593638
in_ch_map $CHANNEL_MAP_5_POINT_1
594639
in_sample_type $SAMPLE_TYPE_MU_LAW
595640
}
641+
{
642+
in_bit_depth 8
643+
in_valid_bit_depth 8
644+
in_channels 7
645+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
646+
in_ch_map $CHANNEL_MAP_5_POINT_1
647+
in_sample_type $SAMPLE_TYPE_MU_LAW
648+
}
596649
{
597650
in_bit_depth 8
598651
in_valid_bit_depth 8
@@ -651,6 +704,14 @@ IncludeByKey.PASSTHROUGH {
651704
out_ch_map $CHANNEL_MAP_5_POINT_1
652705
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
653706
}
707+
{
708+
out_bit_depth 32
709+
out_valid_bit_depth 32
710+
out_channels 7
711+
out_ch_cfg $CHANNEL_CONFIG_5_POINT_1
712+
out_ch_map $CHANNEL_MAP_5_POINT_1
713+
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
714+
}
654715
{
655716
out_bit_depth 32
656717
out_valid_bit_depth 32

‎tools/topology/topology2/include/pipelines/cavs/host-copier-micsel-gain-mixin-playback.conf‎

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
9090
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
9191
in_ch_map $CHANNEL_MAP_5_POINT_1
9292
}
93+
{
94+
in_bit_depth 16
95+
in_valid_bit_depth 16
96+
in_channels 7
97+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
98+
in_ch_map $CHANNEL_MAP_5_POINT_1
99+
}
93100
{
94101
in_bit_depth 16
95102
in_valid_bit_depth 16
@@ -140,6 +147,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
140147
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
141148
in_ch_map $CHANNEL_MAP_5_POINT_1
142149
}
150+
{
151+
in_bit_depth 32
152+
in_valid_bit_depth 24
153+
in_channels 7
154+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
155+
in_ch_map $CHANNEL_MAP_5_POINT_1
156+
}
143157
{
144158
in_bit_depth 32
145159
in_valid_bit_depth 24
@@ -189,6 +203,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
189203
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
190204
in_ch_map $CHANNEL_MAP_5_POINT_1
191205
}
206+
{
207+
in_bit_depth 32
208+
in_valid_bit_depth 32
209+
in_channels 7
210+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
211+
in_ch_map $CHANNEL_MAP_5_POINT_1
212+
}
192213
{
193214
in_bit_depth 32
194215
in_valid_bit_depth 32
@@ -240,6 +261,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
240261
out_ch_cfg $CHANNEL_CONFIG_5_POINT_1
241262
out_ch_map $CHANNEL_MAP_5_POINT_1
242263
}
264+
{
265+
out_bit_depth 32
266+
out_valid_bit_depth 32
267+
out_channels 7
268+
out_ch_cfg $CHANNEL_CONFIG_5_POINT_1
269+
out_ch_map $CHANNEL_MAP_5_POINT_1
270+
}
243271
{
244272
out_bit_depth 32
245273
out_valid_bit_depth 32
@@ -251,7 +279,7 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
251279
}
252280

253281
micsel."1" {
254-
num_input_audio_formats 7
282+
num_input_audio_formats 8
255283
Object.Base.input_audio_format [
256284
{
257285
in_bit_depth 32
@@ -295,6 +323,13 @@ Class.Pipeline."host-copier-micsel-gain-mixin-playback" {
295323
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
296324
in_ch_map $CHANNEL_MAP_5_POINT_1
297325
}
326+
{
327+
in_bit_depth 32
328+
in_valid_bit_depth 32
329+
in_channels 7
330+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
331+
in_ch_map $CHANNEL_MAP_5_POINT_1
332+
}
298333
{
299334
in_bit_depth 32
300335
in_valid_bit_depth 32

0 commit comments

Comments
 (0)