-
Notifications
You must be signed in to change notification settings - Fork 321
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Tools: Topology2: Add Multiband-DRC to sof-hda-efx-generic.tplg
This patch adds the topology2 files for multiband-DRC. The EFX processing chain is gain - FIR - IIR - DRC - Multiband-DRC. The configuration blob default is updated to what is generated by the current example_multiband_drc.m configuration script. The pass-through blob is set as default for tplg2. The topology 1 blobs are updated similarly. Signed-off-by: Seppo Ingalsuo <[email protected]>
- Loading branch information
Showing
9 changed files
with
358 additions
and
40 deletions.
There are no files selected for viewing
This file contains 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
70 changes: 70 additions & 0 deletions
70
tools/topology/topology1/m4/multiband_drc_coef_passthrough.m4
This file contains 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,70 @@ | ||
| # Exported Control Bytes 16-Aug-2023 | ||
| CONTROLBYTES_PRIV(MULTIBAND_DRC_priv, | ||
| ` bytes "0x53,0x4f,0x46,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0xf4,0x01,0x00,0x00,0x00,0xa0,0x01,0x03,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0xf4,0x01,0x00,0x00,0x02,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x7b,0x8e,0x88,0xfe,' | ||
| ` 0x36,0x79,0x57,0x17,0x5f,0x19,0x6f,0x06,' | ||
| ` 0xe8,0x79,0x67,0xd4,0x00,0x00,0x00,0x40,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,' | ||
| ` 0x5f,0x6d,0x19,0xe7,0x39,0xc4,0xd4,0x50,' | ||
| ` 0x0c,0x9b,0x09,0x24,0xad,0x76,0x82,0x9f,' | ||
| ` 0x00,0x00,0x00,0x40,0xff,0xff,0xff,0xff,' | ||
| ` 0x43,0x72,0x00,0x00,0xa1,0xe6,0x90,0xf9,' | ||
| ` 0x18,0x86,0x98,0x2b,0xe3,0x32,0xef,0x00,' | ||
| ` 0x4b,0xf7,0x20,0xf1,0x18,0x69,0xc6,0x28,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,' | ||
| ` 0xf4,0x64,0xf6,0xdb,0x53,0x89,0x7d,0x60,' | ||
| ` 0x5c,0x14,0xf2,0x0a,0x84,0x0d,0x78,0xdc,' | ||
| ` 0xda,0xef,0x21,0x1c,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x40,0x00,0x00,0x6f,0x82,0x53,0xc2,' | ||
| ` 0x3e,0x77,0xa1,0x7d,0x95,0xc1,0x02,0x00,' | ||
| ` 0x2a,0x83,0x05,0x00,0x95,0xc1,0x02,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,' | ||
| ` 0x6f,0x82,0x53,0xc2,0x3e,0x77,0xa1,0x7d,' | ||
| ` 0x34,0x7d,0xd3,0x3e,0x99,0x05,0x59,0x82,' | ||
| ` 0x34,0x7d,0xd3,0x3e,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0x40,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0xe8,0x00,0x00,0x00,0x1e,' | ||
| ` 0x00,0x00,0x00,0x0c,0xd3,0x4d,0x62,0x00,' | ||
| ` 0xb1,0xc2,0x09,0x04,0x55,0x55,0x55,0x05,' | ||
| ` 0x50,0xfa,0x1e,0x00,0x55,0x60,0x94,0x00,' | ||
| ` 0x7e,0x98,0x6a,0xff,0x83,0xc9,0xfe,0x01,' | ||
| ` 0x64,0x47,0x47,0x22,0x17,0x56,0x74,0x01,' | ||
| ` 0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff,' | ||
| ` 0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x36,0x00,0xdf,0x97,0x03,0x00,' | ||
| ` 0xe7,0x3e,0x1e,0x00,0xdf,0x97,0x07,0x00,' | ||
| ` 0x5b,0x91,0x00,0x00,0x00,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x00,0xe8,0x00,0x00,0x00,0x1e,' | ||
| ` 0x00,0x00,0x00,0x0c,0xd3,0x4d,0x62,0x00,' | ||
| ` 0xb1,0xc2,0x09,0x04,0x55,0x55,0x55,0x05,' | ||
| ` 0x50,0xfa,0x1e,0x00,0x55,0x60,0x94,0x00,' | ||
| ` 0x7e,0x98,0x6a,0xff,0x83,0xc9,0xfe,0x01,' | ||
| ` 0x64,0x47,0x47,0x22,0x17,0x56,0x74,0x01,' | ||
| ` 0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff,' | ||
| ` 0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00,' | ||
| ` 0x00,0x00,0x36,0x00,0xdf,0x97,0x03,0x00,' | ||
| ` 0xe7,0x3e,0x1e,0x00,0xdf,0x97,0x07,0x00,' | ||
| ` 0x5b,0x91,0x00,0x00"' | ||
| ) |
This file contains 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 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
65 changes: 65 additions & 0 deletions
65
tools/topology/topology2/include/components/multiband_drc.conf
This file contains 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,65 @@ | ||
| # | ||
| # | ||
| # A generic MULTIBAND_DRC component. All attributes defined herein are namespaced | ||
| # by alsatplg to "Object.Widget.multiband_drc.attribute_name" | ||
| # | ||
| # Usage: this component can be used by declaring in the parent object. i.e. | ||
| # | ||
| # Object.Widget.multiband_drc."N" { | ||
| # index 1 | ||
| # } | ||
| # } | ||
|
|
||
| # | ||
| # Where M is pipeline ID and N is a unique integer in the parent object. | ||
|
|
||
| Class.Widget."multiband_drc" { | ||
| # | ||
| # Pipeline ID | ||
| # | ||
| DefineAttribute."index" { | ||
| type "integer" | ||
| } | ||
|
|
||
| # | ||
| # Unique instance for MULTIBAND_DRC widget | ||
| # | ||
| DefineAttribute."instance" { | ||
| type "integer" | ||
| } | ||
|
|
||
| # Include common widget attributes definition | ||
| <include/components/widget-common.conf> | ||
|
|
||
| attributes { | ||
| !constructor [ | ||
| "index" | ||
| "instance" | ||
| ] | ||
| !mandatory [ | ||
| "num_input_pins" | ||
| "num_output_pins" | ||
| "num_input_audio_formats" | ||
| "num_output_audio_formats" | ||
| ] | ||
|
|
||
| !immutable [ | ||
| "uuid" | ||
| "type" | ||
| ] | ||
| !deprecated [ | ||
| "preload_count" | ||
| ] | ||
| unique "instance" | ||
| } | ||
|
|
||
| # | ||
| # Default attributes for multiband_drc | ||
| # | ||
|
|
||
| uuid "56:22:9f:0d:4f:8e:b3:47:84:48:23:9a:33:4f:11:91" | ||
| type "effect" | ||
| no_pm "true" | ||
| num_input_pins 1 | ||
| num_output_pins 1 | ||
| } |
82 changes: 82 additions & 0 deletions
82
tools/topology/topology2/include/components/multiband_drc/default.conf
This file contains 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,82 @@ | ||
| # Exported Control Bytes 16-Aug-2023 | ||
| Object.Base.data."multiband_drc_config" { | ||
| bytes " | ||
| 0x53,0x4f,0x46,0x34,0x00,0x00,0x00,0x00, | ||
| 0x4c,0x02,0x00,0x00,0x00,0xa0,0x01,0x03, | ||
| 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 0x4c,0x02,0x00,0x00,0x03,0x00,0x00,0x00, | ||
| 0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0x00,0x7b,0x8e,0x88,0xfe, | ||
| 0x36,0x79,0x57,0x17,0x5f,0x19,0x6f,0x06, | ||
| 0xe8,0x79,0x67,0xd4,0x00,0x00,0x00,0x40, | ||
| 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, | ||
| 0x5f,0x6d,0x19,0xe7,0x39,0xc4,0xd4,0x50, | ||
| 0x0c,0x9b,0x09,0x24,0xad,0x76,0x82,0x9f, | ||
| 0x00,0x00,0x00,0x40,0xff,0xff,0xff,0xff, | ||
| 0x43,0x72,0x00,0x00,0xa1,0xe6,0x90,0xf9, | ||
| 0x18,0x86,0x98,0x2b,0xe3,0x32,0xef,0x00, | ||
| 0x4b,0xf7,0x20,0xf1,0x18,0x69,0xc6,0x28, | ||
| 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, | ||
| 0xf4,0x64,0xf6,0xdb,0x53,0x89,0x7d,0x60, | ||
| 0x5c,0x14,0xf2,0x0a,0x84,0x0d,0x78,0xdc, | ||
| 0xda,0xef,0x21,0x1c,0x00,0x00,0x00,0x00, | ||
| 0x00,0x40,0x00,0x00,0x6f,0x82,0x53,0xc2, | ||
| 0x3e,0x77,0xa1,0x7d,0x95,0xc1,0x02,0x00, | ||
| 0x2a,0x83,0x05,0x00,0x95,0xc1,0x02,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, | ||
| 0x6f,0x82,0x53,0xc2,0x3e,0x77,0xa1,0x7d, | ||
| 0x34,0x7d,0xd3,0x3e,0x99,0x05,0x59,0x82, | ||
| 0x34,0x7d,0xd3,0x3e,0x00,0x00,0x00,0x00, | ||
| 0x00,0x40,0x00,0x00,0x2d,0x3a,0xcd,0xd3, | ||
| 0xc0,0xf5,0x82,0x68,0x05,0xf4,0xeb,0x00, | ||
| 0x0a,0xe8,0xd7,0x01,0x05,0xf4,0xeb,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, | ||
| 0x2d,0x3a,0xcd,0xd3,0xc0,0xf5,0x82,0x68, | ||
| 0xe5,0x6e,0x2d,0x35,0x36,0x22,0xa5,0x95, | ||
| 0xe5,0x6e,0x2d,0x35,0x00,0x00,0x00,0x00, | ||
| 0x00,0x40,0x00,0x00,0x2d,0x3a,0xcd,0xd3, | ||
| 0xc0,0xf5,0x82,0x68,0x05,0xf4,0xeb,0x00, | ||
| 0x0a,0xe8,0xd7,0x01,0x05,0xf4,0xeb,0x00, | ||
| 0x00,0x00,0x00,0x00,0x00,0x40,0x00,0x00, | ||
| 0x2d,0x3a,0xcd,0xd3,0xc0,0xf5,0x82,0x68, | ||
| 0xe5,0x6e,0x2d,0x35,0x36,0x22,0xa5,0x95, | ||
| 0xe5,0x6e,0x2d,0x35,0x00,0x00,0x00,0x00, | ||
| 0x00,0x40,0x00,0x00,0x01,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0xe8,0x00,0x00,0x00,0x1e, | ||
| 0x00,0x00,0x00,0x0c,0xd3,0x4d,0x62,0x00, | ||
| 0xb1,0xc2,0x09,0x04,0x55,0x55,0x55,0x05, | ||
| 0x50,0xfa,0x1e,0x00,0x55,0x60,0x94,0x00, | ||
| 0x7e,0x98,0x6a,0xff,0x83,0xc9,0xfe,0x01, | ||
| 0x64,0x47,0x47,0x22,0x17,0x56,0x74,0x01, | ||
| 0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff, | ||
| 0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00, | ||
| 0x00,0x00,0x36,0x00,0xdf,0x97,0x03,0x00, | ||
| 0xe7,0x3e,0x1e,0x00,0xdf,0x97,0x07,0x00, | ||
| 0x5b,0x91,0x00,0x00,0x02,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0xe8,0x00,0x00,0x00,0x1e, | ||
| 0x00,0x00,0x00,0x0c,0xd3,0x4d,0x62,0x00, | ||
| 0xb1,0xc2,0x09,0x04,0x55,0x55,0x55,0x05, | ||
| 0x50,0xfa,0x1e,0x00,0x55,0x60,0x94,0x00, | ||
| 0x7e,0x98,0x6a,0xff,0x83,0xc9,0xfe,0x01, | ||
| 0x64,0x47,0x47,0x22,0x17,0x56,0x74,0x01, | ||
| 0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff, | ||
| 0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00, | ||
| 0x00,0x00,0x36,0x00,0xdf,0x97,0x03,0x00, | ||
| 0xe7,0x3e,0x1e,0x00,0xdf,0x97,0x07,0x00, | ||
| 0x5b,0x91,0x00,0x00,0x03,0x00,0x00,0x00, | ||
| 0x00,0x00,0x00,0xe8,0x00,0x00,0x00,0x1e, | ||
| 0x00,0x00,0x00,0x0c,0xd3,0x4d,0x62,0x00, | ||
| 0xb1,0xc2,0x09,0x04,0x55,0x55,0x55,0x05, | ||
| 0x50,0xfa,0x1e,0x00,0x55,0x60,0x94,0x00, | ||
| 0x7e,0x98,0x6a,0xff,0x83,0xc9,0xfe,0x01, | ||
| 0x64,0x47,0x47,0x22,0x17,0x56,0x74,0x01, | ||
| 0x1c,0xc7,0x71,0x00,0x77,0x77,0x77,0xff, | ||
| 0xd8,0x77,0x1f,0x00,0x05,0x00,0x00,0x00, | ||
| 0x00,0x00,0x36,0x00,0xdf,0x97,0x03,0x00, | ||
| 0xe7,0x3e,0x1e,0x00,0xdf,0x97,0x07,0x00, | ||
| 0x5b,0x91,0x00,0x00" | ||
| } |
Oops, something went wrong.