Tools: Topology2: Add Multiband-DRC to sof-hda-efx-generic.tplg by singalsu · Pull Request #8049 · thesofproject/sof

singalsu · 2023-08-16T16:55:17Z

This patch adds the topology2 files for multiband-DRC. The EFX
processing chain is gain - IIR - FIR - DRC or Multiband-DRC. The
DRC selection is done with macro EFX_DRC_COMPONENT and values
"singleband" and "multiband".
The multiband-drc has two ALSA controls, bytes and switch. The
switch control switches the processing on and off.
The generated topology files with multiband-drc are:
sof-hda-efx-mbdrc-generic.tplg
sof-hda-efx-mbdrc-generic-2ch.tplg
sof-hda-efx-mbdrc-generic-4cg.tplg
The topology files with DRC are as before:
sof-hda-efx-mbdrc-generic.tplg
sof-hda-efx-mbdrc-generic-2ch.tplg
sof-hda-efx-mbdrc-generic-4cg.tplg
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.

Picture of sof-hda-efx-mbdrc-generic.tplg with multi-band DRC:

PIcture of sof-hda-efx-mbdrc-generic.tplg with DRC:

singalsu · 2023-08-16T16:56:26Z

 Object.Widget.drc.1 {
 Object.Control.bytes."1" {
- name '2 Main playback DRC'
+ name 'Post Mixer $ANALOG_PLAYBACK_PCM DRC'


This small fix could be separate commit.

lgirdwood

PR may need split

lgirdwood

I think you have slef reviewed and identified the changes needed.

lgirdwood · 2023-08-23T14:16:31Z

 Object.Widget.drc.1 {
 Object.Control.bytes."1" {
- name '2 Main playback DRC'
+ name 'Post Mixer $ANALOG_PLAYBACK_PCM DRC'


lgirdwood · 2023-08-25T16:15:48Z

@@ -0,0 +1,71 @@
+# Exported Control Bytes 16-Aug-2023


We really need to have a comment explaining how these are generated.

Yep, I'll do a PR to change the text in the tool.

Now fixed in this PR, re-exported the blobs. Tool PR is #8142.

This patch adds the topology2 files for multiband-DRC. The EFX processing chain is gain - IIR - FIR - DRC or Multiband-DRC. The DRC selection is done with macro EFX_DRC_COMPONENT and values "singleband" and "multiband". The multiband-drc has two ALSA controls, bytes and switch. The switch control switches the processing on and off. The generated topology files with multiband-drc are: sof-hda-efx-mbdrc-generic.tplg sof-hda-efx-mbdrc-generic-2ch.tplg sof-hda-efx-mbdrc-generic-4cg.tplg The topology files with DRC are as before: sof-hda-efx-mbdrc-generic.tplg sof-hda-efx-mbdrc-generic-2ch.tplg sof-hda-efx-mbdrc-generic-4cg.tplg 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 <seppo.ingalsuo@linux.intel.com>

kv2019i

@ranj063 @jsarha for tplg conventions, ok?

johnylin76

LGTM, thanks.

johnylin76 · 2023-09-06T06:24:37Z

Hi @singalsu I have a question about multi-stream mix-out playback. (not related to this PR, just come into my mind while reviewing).

For GOOGLE_AEC topology, the AEC module has one input for echo reference, which is sourced from a DEMUX on playback pipeline. The expectation for compound topology graph of both multi-stream and AEC may be formed as follows:

PCM0P (pipeline 2) ---> Volume ------|
V
Mixer (pipeline 1) -----> DEMUX ---> SSP0
^ |
PCM1P (pipeline 3) ---> EQIIR ------| |
|-----------------|
V
PCM2C (pipeline 5) <--------- NR <--------- AEC <--|
|
Mixer (pipeline 4) <--- DMIC1
|
PCM3C (pipeline 6) <-------------------------------|

Do you think this is technically feasible?
FYI, AEC can be run without active echo reference, the playback and capture path are independent of each other.

singalsu · 2023-09-07T07:23:24Z

Do you think this is technically feasible?
FYI, AEC can be run without active echo reference, the playback and capture path are independent of each other.

@johnylin76 The capture direction looks good, except typo with mixer, you must have meant demux there.

In playback direction the IIR location would be typically for all playback just before demux but if you need the other stream un-equalized this would be the way. I don't see why such topology would not work. I once tried 48 -> 16 kHz SRC with a mock-up AEC a reference path that wasn't working due to a scheduler limitation but here the reference path is without processing.

@kv2019i @mengdonglin @plbossart please chime in if this something not committed. Also SOF releases have differences in scheduler & pipelines capability, v2.2 may be more limited.

singalsu commented Aug 16, 2023
View reviewed changes

singalsu force-pushed the tplg2_add_multiband_drc branch from f7b160c to 8982a62Compare August 22, 2023 13:58

singalsu commented Aug 22, 2023
View reviewed changes

Comment threadtools/topology/topology2/cavs-mixin-mixout-efx-hda.conf Outdated
Comment threadtools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf Outdated

lgirdwood reviewed Aug 22, 2023
View reviewed changes

Comment threadtools/topology/topology1/m4/multiband_drc_coef_passthrough.m4

singalsu force-pushed the tplg2_add_multiband_drc branch from 8982a62 to 70fba1fCompare August 23, 2023 08:28

singalsu mentioned this pull request Aug 23, 2023
Audio: Multiband-DRC: Convert to module adapter #7698
Merged

lgirdwood reviewed Aug 23, 2023
View reviewed changes

singalsu force-pushed the tplg2_add_multiband_drc branch from 70fba1f to d1a7471Compare August 25, 2023 11:17

singalsu marked this pull request as ready for review August 25, 2023 11:20

singalsu requested review from jsarha and ranj063 as code owners August 25, 2023 11:20

singalsu requested a review from a teamAugust 25, 2023 11:21

lgirdwood reviewed Aug 25, 2023
View reviewed changes

cujomalainey reviewed Aug 25, 2023
View reviewed changes

Comment threadtools/topology/topology2/include/components/multiband_drc.conf
Comment threadtools/topology/topology2/include/components/multiband_drc.conf

singalsu force-pushed the tplg2_add_multiband_drc branch from d1a7471 to 8e7a015Compare September 1, 2023 13:40

singalsu requested review from cujomalainey and lgirdwood September 1, 2023 13:40

cujomalainey approved these changes Sep 1, 2023
View reviewed changes

cujomalainey requested a review from johnylin76 September 1, 2023 20:39

kv2019i approved these changes Sep 5, 2023
View reviewed changes

johnylin76 approved these changes Sep 6, 2023
View reviewed changes

lgirdwood approved these changes Sep 11, 2023
View reviewed changes

lgirdwood merged commit 84809f9 into thesofproject:mainSep 11, 2023

Uh oh!

Conversation

singalsu commented Aug 16, 2023• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

singalsuAug 16, 2023

Choose a reason for hiding this comment

Uh oh!

lgirdwoodAug 23, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

lgirdwood left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

lgirdwood left a comment

Choose a reason for hiding this comment

Uh oh!

lgirdwoodAug 23, 2023

Choose a reason for hiding this comment

Uh oh!

lgirdwoodAug 25, 2023

Choose a reason for hiding this comment

Uh oh!

singalsuSep 1, 2023

Choose a reason for hiding this comment

Uh oh!

singalsuSep 1, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

johnylin76 left a comment

Choose a reason for hiding this comment

Uh oh!

johnylin76 commented Sep 6, 2023

Uh oh!

singalsu commented Sep 7, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

singalsu commented Aug 16, 2023•
edited
Loading