Skip to content

Commit b8224fd

Browse files
committed
Tools: Topology: Add to nocodec support for float sample type
This type adds to nocodec PCM and host-copier FLOAT_LE format support. The float format is converted at host-copier to/from normal S32_LE pipelines format. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent 4aa2966 commit b8224fd

2 files changed

Lines changed: 16 additions & 4 deletions

File tree

app/boards/intel_adsp_cavs25.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
2626
CONFIG_FORMAT_U8=y
2727
CONFIG_FORMAT_A_LAW=y
2828
CONFIG_FORMAT_MU_LAW=y
29+
CONFIG_FORMAT_FLOAT=y
2930
CONFIG_PCM_CONVERTER_FORMAT_U8=y
3031
CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y
3132
CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y
33+
CONFIG_PCM_CONVERTER_FORMAT_FLOAT=y
3234

3335
# SOF / infrastructure
3436
CONFIG_AMS=y

tools/topology/topology2/cavs-nocodec.conf

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ IncludeByKey.PASSTHROUGH {
221221
Object.Widget.host-copier.1 {
222222
stream_name 'SSP0 Playback'
223223
pcm_id 0
224-
num_input_audio_formats 6
224+
num_input_audio_formats 7
225225
num_output_audio_formats 1
226226
Object.Base.input_audio_format [
227227
{
@@ -251,6 +251,11 @@ IncludeByKey.PASSTHROUGH {
251251
in_bit_depth 32
252252
in_valid_bit_depth 32
253253
}
254+
{
255+
in_bit_depth 32
256+
in_valid_bit_depth 32
257+
in_sample_type $SAMPLE_TYPE_FLOAT
258+
}
254259
]
255260
Object.Base.output_audio_format [
256261
{
@@ -362,7 +367,7 @@ IncludeByKey.PASSTHROUGH {
362367
stream_name 'SSP0 Capture'
363368
pcm_id $SSP0_PCM_ID
364369
num_input_audio_formats 1
365-
num_output_audio_formats 6
370+
num_output_audio_formats 7
366371
Object.Base.input_audio_format [
367372
{
368373
in_bit_depth 32
@@ -397,6 +402,11 @@ IncludeByKey.PASSTHROUGH {
397402
out_bit_depth 32
398403
out_valid_bit_depth 32
399404
}
405+
{
406+
out_bit_depth 32
407+
out_valid_bit_depth 32
408+
out_sample_type $SAMPLE_TYPE_FLOAT
409+
}
400410
]
401411
}
402412
Object.Widget.gain.1 {
@@ -1077,7 +1087,7 @@ Object.PCM.pcm [
10771087
Object.PCM.pcm_caps.1 {
10781088
direction "playback"
10791089
name "SSP0 Playback"
1080-
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW'
1090+
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW,FLOAT_LE'
10811091
IncludeByKey.SSP0_RATE {
10821092
"48000" {
10831093
rates '48000'
@@ -1094,7 +1104,7 @@ Object.PCM.pcm [
10941104
Object.PCM.pcm_caps.2 {
10951105
direction "capture"
10961106
name "SSP0 Capture"
1097-
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW'
1107+
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW,FLOAT_LE'
10981108
IncludeByKey.SSP0_RATE {
10991109
"48000" {
11001110
rates '48000'

0 commit comments

Comments
 (0)