Skip to content
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.

Sign up for GitHub

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

Tools: Topology2: Add build of 1ch DMIC topologies #9763

Merged
merged 4 commits into from
Jan 22, 2025
Merged

Tools: Topology2: Add build of 1ch DMIC topologies #9763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e2f70e
Tools: Topology2: Add missing mono formats to dmic-generic.conf
singalsu Jan 3, 2025
2703636
Tools: Topology2: Add mono formats to dmic1-passthrough.conf
singalsu Jan 3, 2025
904679e
Tools: Topology2: Add mono formats to dmic1-mfcc.conf
singalsu Jan 3, 2025
6615043
Tools: Topology2: Add build of 1ch DMIC topologies
singalsu Jan 2, 2025
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
169 changes: 167 additions & 2 deletions tools/topology/topology2/platform/intel/dmic-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ Define {
IncludeByKey.DMIC0_PCM_CHANNELS {
"0" {
IncludeByKey.NUM_DMICS {
"1" {
Define {
DMIC0_PCM_CHANNELS 1
}
}
"2" {
Define {
DMIC0_PCM_CHANNELS 2
Expand Down Expand Up @@ -104,6 +109,28 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 1
num_output_audio_formats 1
IncludeByKey.DMIC0_PCM_CHANNELS {
"1" {
Object.Base.input_audio_format [
{
singalsu marked this conversation as resolved.
Show resolved Hide resolved
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
]
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_channels 1
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_MONO
out_ch_map $CHANNEL_MAP_MONO
}
]
}
"2" {
Object.Base.input_audio_format [
{
Expand Down Expand Up @@ -166,6 +193,45 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 3
num_output_audio_formats 1
IncludeByKey.NUM_DMICS {
"1" {
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 16
in_valid_bit_depth 16
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 24
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
]
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_channels 1
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_MONO
out_ch_map $CHANNEL_MAP_MONO
}
]
}
"2" {
Object.Base.input_audio_format [
{
Expand Down Expand Up @@ -240,6 +306,28 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 1
num_output_audio_formats 1
IncludeByKey.NUM_DMICS {
"1" {
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
]
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_channels 1
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_MONO
out_ch_map $CHANNEL_MAP_MONO
}
]
}
"2" {
Object.Base.input_audio_format [
{
Expand Down Expand Up @@ -293,6 +381,28 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 1
num_output_audio_formats 1
IncludeByKey.NUM_DMICS {
"1" {
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
]
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_channels 1
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_MONO
out_ch_map $CHANNEL_MAP_MONO
}
]
}
"2" {
Object.Base.input_audio_format [
{
Expand Down Expand Up @@ -341,6 +451,28 @@ IncludeByKey.PASSTHROUGH {
num_input_audio_formats 1
num_output_audio_formats 1
IncludeByKey.NUM_DMICS {
"1" {
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
]
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_channels 1
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_MONO
out_ch_map $CHANNEL_MAP_MONO
}
]
}
"2" {
Object.Base.input_audio_format [
{
Expand Down Expand Up @@ -633,8 +765,33 @@ IncludeByKey.PASSTHROUGH {
type dai_out
stream_name $DMIC0_NAME
node_type $DMIC_LINK_INPUT_CLASS
num_input_audio_formats 6
num_input_audio_formats 9
Object.Base.input_audio_format [
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 16
in_valid_bit_depth 16
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 24
in_sample_type $SAMPLE_TYPE_MSB_INTEGER
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
{
in_rate $DMIC0_RATE
in_channels 1
in_bit_depth 32
in_valid_bit_depth 32
in_ch_cfg $CHANNEL_CONFIG_MONO
in_ch_map $CHANNEL_MAP_MONO
}
{
in_rate $DMIC0_RATE
in_bit_depth 16
Expand Down Expand Up @@ -677,8 +834,16 @@ IncludeByKey.PASSTHROUGH {
in_ch_map $CHANNEL_MAP_3_POINT_1
}
]
num_output_audio_formats 2
num_output_audio_formats 3
Object.Base.output_audio_format [
{
out_rate $DMIC0_RATE
out_channels 1
out_bit_depth 32
out_valid_bit_depth 32
out_ch_cfg $CHANNEL_CONFIG_MONO
out_ch_map $CHANNEL_MAP_MONO
}
{
out_rate $DMIC0_RATE
out_bit_depth 32
Expand Down
Loading
Loading