Skip to content

topology2: webrtc-aec: use single format on the input pins #11348

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

Open
ujfalusi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

topology2: webrtc-aec: use single format on the input pins #11348

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 7 additions & 23 deletions tools/topology/topology2/include/components/webrtc-aec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,9 +100,13 @@ Class.Widget."webrtc-aec" {
}
}

# 4 input formats: pin0 (mic) S16/S32 + pin1 (ref) S16/S32
num_input_audio_formats 4
num_output_audio_formats 2
# pin0 is the microphone and pin1 is the echo reference. The module has multiple
# input pins, each pin must have a single format since the formats of the pins
# cannot be selected at runtime. The output uses the sample format of pin0.
# Override the formats in the widget object for S32 (pin0 and output) or for a
# different channel count.
Comment on lines +106 to +107
num_input_audio_formats 2
num_output_audio_formats 1

Object.Base.input_audio_format [
# Pin 0 — microphone S16
Expand All @@ -112,27 +116,13 @@ Class.Widget."webrtc-aec" {
in_valid_bit_depth 16
ibs "$[(($in_channels * ($[($in_rate + 999)] / 1000)) * ($in_bit_depth / 8)) * $WEBRTC_AEC_PERIOD_MS]"
}
# Pin 0 — microphone S32
{
input_pin_index 0
in_bit_depth 32
in_valid_bit_depth 32
ibs "$[(($in_channels * ($[($in_rate + 999)] / 1000)) * ($in_bit_depth / 8)) * $WEBRTC_AEC_PERIOD_MS]"
}
# Pin 1 — echo reference S16
{
input_pin_index 1
in_bit_depth 16
in_valid_bit_depth 16
ibs "$[(($in_channels * ($[($in_rate + 999)] / 1000)) * ($in_bit_depth / 8)) * $WEBRTC_AEC_PERIOD_MS]"
}
# Pin 1 — echo reference S32
{
input_pin_index 1
in_bit_depth 32
in_valid_bit_depth 32
ibs "$[(($in_channels * ($[($in_rate + 999)] / 1000)) * ($in_bit_depth / 8)) * $WEBRTC_AEC_PERIOD_MS]"
}
]

Object.Base.output_audio_format [
Expand All @@ -142,12 +132,6 @@ Class.Widget."webrtc-aec" {
out_valid_bit_depth 16
obs "$[(($out_channels * ($[($out_rate + 999)] / 1000)) * ($out_bit_depth / 8)) * $WEBRTC_AEC_PERIOD_MS]"
}
# S32 output
{
out_bit_depth 32
out_valid_bit_depth 32
obs "$[(($out_channels * ($[($out_rate + 999)] / 1000)) * ($out_bit_depth / 8)) * $WEBRTC_AEC_PERIOD_MS]"
}
]

# UUID: e5da7b5b-133a-ba46-b517651d6300bb83
Expand Down
Loading