-
Notifications
You must be signed in to change notification settings - Fork 350
Audio: MFCC: Updates to run MFCC in sof-testbench4 #10727
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
Open
singalsu
wants to merge
5
commits into
thesofproject:main
Choose a base branch
from
singalsu:mfcc_update
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
e0d6c02
Tools: Testbench: Fix capture topology prepare failure in file component
singalsu c6220a8
Tools: Topology: Delete unused test topology .conf
singalsu 306fbeb
Tools: Topology: Add test topologies for MFCC
singalsu e3107ec
Audio: MFCC: Use sof-testbench4 and topology2 to run the module
singalsu 45da55c
Audio: MFCC: Move setup and run scripts to module directory
singalsu File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
9 changes: 4 additions & 5 deletions
9
tools/tune/mfcc/run_mfcc.sh → src/audio/mfcc/tune/run_mfcc.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
tools/topology/topology2/include/bench/host_gateway_pipelines_s16_16k.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| Object.Pipeline { | ||
| host-gateway-playback [ | ||
| { | ||
| index $BENCH_PLAYBACK_HOST_PIPELINE | ||
| Object.Widget.host-copier.1 { | ||
| stream_name $ANALOG_PLAYBACK_PCM | ||
| pcm_id 0 | ||
| num_input_audio_formats 3 | ||
| num_output_audio_formats 1 | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_bit_depth 16 | ||
| in_valid_bit_depth 16 | ||
| in_rate 16000 | ||
|
singalsu marked this conversation as resolved.
|
||
| } | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 24 | ||
| in_rate 16000 | ||
| } | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| in_rate 16000 | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_bit_depth 16 | ||
| out_valid_bit_depth 16 | ||
| out_rate 16000 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
|
|
||
| host-gateway-capture [ | ||
| { | ||
| index $BENCH_CAPTURE_HOST_PIPELINE | ||
| Object.Widget.host-copier.1 { | ||
| stream_name $ANALOG_CAPTURE_PCM | ||
| pcm_id 0 | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 3 | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_bit_depth 16 | ||
| in_valid_bit_depth 16 | ||
| in_rate 16000 | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_bit_depth 16 | ||
| out_valid_bit_depth 16 | ||
| out_rate 16000 | ||
| } | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 24 | ||
| out_rate 16000 | ||
| } | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| out_rate 16000 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
|
|
||
74 changes: 74 additions & 0 deletions
74
tools/topology/topology2/include/bench/host_gateway_pipelines_s24_16k.conf
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| Object.Pipeline { | ||
| host-gateway-playback [ | ||
| { | ||
| index $BENCH_PLAYBACK_HOST_PIPELINE | ||
| Object.Widget.host-copier.1 { | ||
| stream_name $ANALOG_PLAYBACK_PCM | ||
| pcm_id 0 | ||
| num_input_audio_formats 3 | ||
| num_output_audio_formats 1 | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_bit_depth 16 | ||
| in_valid_bit_depth 16 | ||
| in_rate 16000 | ||
| } | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 24 | ||
| in_rate 16000 | ||
| } | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 32 | ||
| in_rate 16000 | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 24 | ||
| out_rate 16000 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
|
|
||
| host-gateway-capture [ | ||
| { | ||
| index $BENCH_CAPTURE_HOST_PIPELINE | ||
| Object.Widget.host-copier.1 { | ||
| stream_name $ANALOG_CAPTURE_PCM | ||
| pcm_id 0 | ||
| num_input_audio_formats 1 | ||
| num_output_audio_formats 3 | ||
| Object.Base.input_audio_format [ | ||
| { | ||
| in_bit_depth 32 | ||
| in_valid_bit_depth 24 | ||
| in_rate 16000 | ||
| } | ||
| ] | ||
| Object.Base.output_audio_format [ | ||
| { | ||
| out_bit_depth 16 | ||
| out_valid_bit_depth 16 | ||
| out_rate 16000 | ||
| } | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 24 | ||
| out_rate 16000 | ||
| } | ||
| { | ||
| out_bit_depth 32 | ||
| out_valid_bit_depth 32 | ||
| out_rate 16000 | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| ] | ||
| } | ||
|
|
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
mfccis now included in the genericcomponentslist, which means this CMake loop will also generate SDW benchmark targets for MFCC. Howevercavs-benchmark-sdw.confintentionally does not define anyBENCH_CONFIGkeys formfcc16/24/32, so those generated SDW topologies will silently omit MFCC and produce misleading/incorrect artifacts. Consider either excluding MFCC from the SDW target generation here (special-casecomp == mfcc) or adding properly rate-matched MFCC entries to the SDWIncludeByKey.BENCH_CONFIGblock.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't prefer to do that to not create CMake complexity that would be changed again later. The tests are not running the SDW benchmark variants. The topology built for SDW now is just empty. I'll create in later phase topologies for real devices with SRC in a split pipeline from the module copier.