Skip to content

Tools: Topology2: Add 8-bit formats to nocodec topologies #10030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/boards/intel_adsp_cavs25.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ CONFIG_PCM_CONVERTER_FORMAT_S16_C16_AND_S16_C32=y
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S32_C32=y
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S24_C32=y
CONFIG_PCM_CONVERTER_FORMAT_S16_C32_AND_S16_C32=y
CONFIG_FORMAT_U8=y
CONFIG_FORMAT_A_LAW=y
CONFIG_FORMAT_MU_LAW=y
CONFIG_PCM_CONVERTER_FORMAT_U8=y
CONFIG_PCM_CONVERTER_FORMAT_A_LAW=y
CONFIG_PCM_CONVERTER_FORMAT_MU_LAW=y

# SOF / infrastructure
CONFIG_AMS=y
Expand Down
78 changes: 76 additions & 2 deletions tools/topology/topology2/cavs-nocodec.conf
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,43 @@ IncludeByKey.PASSTHROUGH {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Playback'
pcm_id 0
num_input_audio_formats 6
num_output_audio_formats 1
Object.Base.input_audio_format [
{
in_bit_depth 8
in_valid_bit_depth 8
in_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
}
{
in_bit_depth 8
in_valid_bit_depth 8
in_sample_type $SAMPLE_TYPE_A_LAW
}
{
in_bit_depth 8
in_valid_bit_depth 8
in_sample_type $SAMPLE_TYPE_MU_LAW
}
{
in_bit_depth 16
in_valid_bit_depth 16
}
{
in_bit_depth 32
in_valid_bit_depth 24
}
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Expand Down Expand Up @@ -324,6 +361,43 @@ IncludeByKey.PASSTHROUGH {
Object.Widget.host-copier.1 {
stream_name 'SSP0 Capture'
pcm_id $SSP0_PCM_ID
num_input_audio_formats 1
num_output_audio_formats 6
Object.Base.input_audio_format [
{
in_bit_depth 32
in_valid_bit_depth 32
}
]
Object.Base.output_audio_format [
{
out_bit_depth 8
out_valid_bit_depth 8
out_sample_type $SAMPLE_TYPE_UNSIGNED_INTEGER
}
{
out_bit_depth 8
out_valid_bit_depth 8
out_sample_type $SAMPLE_TYPE_A_LAW
}
{
out_bit_depth 8
out_valid_bit_depth 8
out_sample_type $SAMPLE_TYPE_MU_LAW
}
{
out_bit_depth 16
out_valid_bit_depth 16
}
{
out_bit_depth 32
out_valid_bit_depth 24
}
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
Object.Widget.gain.1 {
curve_type "windows_fade"
Expand Down Expand Up @@ -1003,7 +1077,7 @@ Object.PCM.pcm [
Object.PCM.pcm_caps.1 {
direction "playback"
name "SSP0 Playback"
formats 'S16_LE,S24_LE,S32_LE'
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW'
IncludeByKey.SSP0_RATE {
"48000" {
rates '48000'
Expand All @@ -1020,7 +1094,7 @@ Object.PCM.pcm [
Object.PCM.pcm_caps.2 {
direction "capture"
name "SSP0 Capture"
formats 'S16_LE,S24_LE,S32_LE'
formats 'S16_LE,S24_LE,S32_LE,U8,A_LAW,MU_LAW'
IncludeByKey.SSP0_RATE {
"48000" {
rates '48000'
Expand Down
Loading