Skip to content

Commit 8f25b6c

Browse files
committed
Tools: Topology: Add 8-bit S8 format to host-copier
This patch adds signed 8-bit format support to host-copier for SSP0 Playback and SSP0 Capture PCMs. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent fe83dd7 commit 8f25b6c

File tree

1 file changed

+65
-4
lines changed

1 file changed

+65
-4
lines changed

tools/topology/topology2/cavs-nocodec.conf

Lines changed: 65 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ IncludeByKey.PASSTHROUGH {
226226
Object.Widget.host-copier.1 {
227227
stream_name 'SSP0 Playback'
228228
pcm_id 0
229-
num_input_audio_formats 49
229+
num_input_audio_formats 56
230230
num_output_audio_formats 7
231231

232232
Object.Base.input_audio_format [
@@ -490,6 +490,62 @@ IncludeByKey.PASSTHROUGH {
490490
in_ch_map $CHANNEL_MAP_7_POINT_1
491491
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
492492
}
493+
{
494+
in_bit_depth 8
495+
in_valid_bit_depth 8
496+
in_channels 1
497+
in_ch_cfg $CHANNEL_CONFIG_MONO
498+
in_ch_map $CHANNEL_MAP_MONO
499+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
500+
}
501+
{
502+
in_bit_depth 8
503+
in_valid_bit_depth 8
504+
in_channels 2
505+
in_ch_cfg $CHANNEL_CONFIG_STEREO
506+
in_ch_map $CHANNEL_MAP_STEREO
507+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
508+
}
509+
{
510+
in_bit_depth 8
511+
in_valid_bit_depth 8
512+
in_channels 3
513+
in_ch_cfg $CHANNEL_CONFIG_2_POINT_1
514+
in_ch_map $CHANNEL_MAP_2_POINT_1
515+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
516+
}
517+
{
518+
in_bit_depth 8
519+
in_valid_bit_depth 8
520+
in_channels 4
521+
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
522+
in_ch_map $CHANNEL_MAP_3_POINT_1
523+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
524+
}
525+
{
526+
in_bit_depth 8
527+
in_valid_bit_depth 8
528+
in_channels 5
529+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_0
530+
in_ch_map $CHANNEL_MAP_5_POINT_0
531+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
532+
}
533+
{
534+
in_bit_depth 8
535+
in_valid_bit_depth 8
536+
in_channels 6
537+
in_ch_cfg $CHANNEL_CONFIG_5_POINT_1
538+
in_ch_map $CHANNEL_MAP_5_POINT_1
539+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
540+
}
541+
{
542+
in_bit_depth 8
543+
in_valid_bit_depth 8
544+
in_channels 8
545+
in_ch_cfg $CHANNEL_CONFIG_7_POINT_1
546+
in_ch_map $CHANNEL_MAP_7_POINT_1
547+
in_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
548+
}
493549
{
494550
in_bit_depth 8
495551
in_valid_bit_depth 8
@@ -779,7 +835,7 @@ IncludeByKey.PASSTHROUGH {
779835
stream_name 'SSP0 Capture'
780836
pcm_id $SSP0_PCM_ID
781837
num_input_audio_formats 1
782-
num_output_audio_formats 7
838+
num_output_audio_formats 8
783839
Object.Base.input_audio_format [
784840
{
785841
in_bit_depth 32
@@ -792,6 +848,11 @@ IncludeByKey.PASSTHROUGH {
792848
out_valid_bit_depth 8
793849
out_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
794850
}
851+
{
852+
out_bit_depth 8
853+
out_valid_bit_depth 8
854+
out_sample_type $SAMPLE_TYPE_SIGNED_INTEGER
855+
}
795856
{
796857
out_bit_depth 8
797858
out_valid_bit_depth 8
@@ -1581,7 +1642,7 @@ Object.PCM.pcm [
15811642
Object.PCM.pcm_caps.1 {
15821643
direction "playback"
15831644
name "SSP0 Playback"
1584-
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW,FLOAT_LE'
1645+
formats 'S16_LE,S24_LE,S32_LE,U8,S8,A_LAW,MU_LAW,FLOAT_LE'
15851646
IncludeByKey.SSP0_RATE {
15861647
"48000" {
15871648
rates '48000'
@@ -1604,7 +1665,7 @@ Object.PCM.pcm [
16041665
Object.PCM.pcm_caps.2 {
16051666
direction "capture"
16061667
name "SSP0 Capture"
1607-
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW,FLOAT_LE'
1668+
formats 'S16_LE,S24_LE,S32_LE,U8,S8,A_LAW,MU_LAW,FLOAT_LE'
16081669
IncludeByKey.SSP0_RATE {
16091670
"48000" {
16101671
rates '48000'

0 commit comments

Comments
 (0)