Skip to content

Commit 70a406f

Browse files
singalsulgirdwood
authored andcommitted
Tools: Topology2: Add 8-bit formats to nocodec topologies
To enable testing of new feature, this patch adds to nocodec topologies to PCM0 host copier playback and capture the support for 8-bit formats unsigned, A-law, and mu-law. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
1 parent 1726e78 commit 70a406f

1 file changed

Lines changed: 76 additions & 2 deletions

File tree

tools/topology/topology2/cavs-nocodec.conf

Lines changed: 76 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,43 @@ IncludeByKey.PASSTHROUGH {
221221
Object.Widget.host-copier.1 {
222222
stream_name 'SSP0 Playback'
223223
pcm_id 0
224+
num_input_audio_formats 6
225+
num_output_audio_formats 1
226+
Object.Base.input_audio_format [
227+
{
228+
in_bit_depth 8
229+
in_valid_bit_depth 8
230+
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
231+
}
232+
{
233+
in_bit_depth 8
234+
in_valid_bit_depth 8
235+
in_sample_type $SAMPLE_TYPE_A_LAW
236+
}
237+
{
238+
in_bit_depth 8
239+
in_valid_bit_depth 8
240+
in_sample_type $SAMPLE_TYPE_MU_LAW
241+
}
242+
{
243+
in_bit_depth 16
244+
in_valid_bit_depth 16
245+
}
246+
{
247+
in_bit_depth 32
248+
in_valid_bit_depth 24
249+
}
250+
{
251+
in_bit_depth 32
252+
in_valid_bit_depth 32
253+
}
254+
]
255+
Object.Base.output_audio_format [
256+
{
257+
out_bit_depth 32
258+
out_valid_bit_depth 32
259+
}
260+
]
224261
}
225262
Object.Widget.gain.1 {
226263
curve_type "windows_fade"
@@ -324,6 +361,43 @@ IncludeByKey.PASSTHROUGH {
324361
Object.Widget.host-copier.1 {
325362
stream_name 'SSP0 Capture'
326363
pcm_id $SSP0_PCM_ID
364+
num_input_audio_formats 1
365+
num_output_audio_formats 6
366+
Object.Base.input_audio_format [
367+
{
368+
in_bit_depth 32
369+
in_valid_bit_depth 32
370+
}
371+
]
372+
Object.Base.output_audio_format [
373+
{
374+
out_bit_depth 8
375+
out_valid_bit_depth 8
376+
out_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
377+
}
378+
{
379+
out_bit_depth 8
380+
out_valid_bit_depth 8
381+
out_sample_type $SAMPLE_TYPE_A_LAW
382+
}
383+
{
384+
out_bit_depth 8
385+
out_valid_bit_depth 8
386+
out_sample_type $SAMPLE_TYPE_MU_LAW
387+
}
388+
{
389+
out_bit_depth 16
390+
out_valid_bit_depth 16
391+
}
392+
{
393+
out_bit_depth 32
394+
out_valid_bit_depth 24
395+
}
396+
{
397+
out_bit_depth 32
398+
out_valid_bit_depth 32
399+
}
400+
]
327401
}
328402
Object.Widget.gain.1 {
329403
curve_type "windows_fade"
@@ -1003,7 +1077,7 @@ Object.PCM.pcm [
10031077
Object.PCM.pcm_caps.1 {
10041078
direction "playback"
10051079
name "SSP0 Playback"
1006-
formats 'S16_LE,S24_LE,S32_LE'
1080+
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW'
10071081
IncludeByKey.SSP0_RATE {
10081082
"48000" {
10091083
rates '48000'
@@ -1020,7 +1094,7 @@ Object.PCM.pcm [
10201094
Object.PCM.pcm_caps.2 {
10211095
direction "capture"
10221096
name "SSP0 Capture"
1023-
formats 'S16_LE,S24_LE,S32_LE'
1097+
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW'
10241098
IncludeByKey.SSP0_RATE {
10251099
"48000" {
10261100
rates '48000'

0 commit comments

Comments
 (0)