Tools: Topology2: Add enhanced audio capture development topologies #9176

singalsu · 2024-05-30T12:45:16Z

Example of sof-hda-efx-generic.tplg

Example of sof-hda-efx-generic-2ch.tplg

In HDA analog capture the beamformer are configured to always be in passthrough mode. User switch controls have no impact. A processing blob that enhances audio must be set up by ALSA UCM.

In DMIC 2ch the beamformer is set up for very small stereo opening angle for user focus. In DMIC 4ch the beamformer is always passthrough. UCM could be set up to apply beams for 3.0 or 3.1 format as 4ch but it's not yet available. There is also topology sof-hda-efx-generic-4to2ch.tplg that always converts to 2ch, beam off is channels 1 and 4 passthrough. Beam on is stereo beams with 4 mic.

In HDA analog capture the DRC is configured to passthrough. User switch controls have no impact. The ALSA UCM needs to apply a blob to get processing for notebook speaker mode.

In DMIC capture the DRC is set up to 10 dB soft amplification.

There is a small change done to every DMIC capture pipeline (using platform/intel/dmic-generic.-conf). The gain component is moved before module-copier. It ensures that every new pipeline connected to module-copier follows the mic mute keys control. See e.g. sof-hda-generic-2ch.tplg.

singalsu · 2024-05-30T14:15:35Z

tools/topology/topology2/platform/intel/dmic-generic.conf

+								"line2_68mm" "include/components/tdfb/line2_68mm_pm0_30_90deg_48khz.conf"
+								"line2_74mm" "include/components/tdfb/line2_74mm_pm0_30_90deg_48khz.conf"
+								"line4_pass" "include/components/tdfb/line4_pass.conf"
+								"line4to2_pass" "include/components/tdfb/line4to2_pass.conf"


Note: For now only pass-through for four DMIC systems for 4ch capture. I don't have yet a 3 beams blob for TDFB but it should be possible. With such we could produce a 3.1 (L, R, C, LFE) or 3.0 format stream in 4ch container. Create of LFE stream is not possible with current TDFB so it would be zero PCM code. I'm not sure if 3.0 format wav is 4ch or 3ch. If 3ch I'm not sure it's possible with SOF. Also I'm not sure how Linux user space handles 4ch streams, does the SOF topology channel map type impact.

Note: The blobs line4to2_pass and line4_generic_pm10deg convert 4ch to 2ch. To use them the topology needs to be set for 2ch PCM for DMIC.

kv2019i

Slight concern on bisectability, but not a blocker and otherwise looks clean.

kv2019i · 2024-06-04T11:12:01Z

tools/topology/topology2/cavs-nocodec.conf

@@ -23,7 +23,7 @@
 <mixout-gain-dai-copier-playback.conf>


Slight concern how the first two interact. If you bisect git and hit the the tree between patches 1&2 in this series, you are left with e.g. SDW topologies without gain on the dmic capture, right?

OTOH, this is pretty minor impact, we rarely bisect topology changes like these and I can understand the separate commits are easier to review.

That's a good point. Please think and let me know, combining patches 1 and 2 would be easy.

@singalsu I'm good with this if not other reasons to revisit the series.

lyakh · 2024-06-04T15:07:18Z

...s/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-gain-module-copier-capture.conf

+		route.1 {
+			source	gain.$index.1
+			sink	module-copier.$index.2
+		}


shouldn't all the routes be included? Also between the DAI - eqiir - gain?

Yes, agree, I think this is my mistake. Doing it here will clean up top level.

lyakh · 2024-06-05T07:57:29Z

tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf

+                                sink 'drc.3.1'
+                        }
+                        {
+                                source 'drc.3.1'


ok, this is now very explicit and easy to understand: a0->b0, b1->c0, c1->d0, where a, b, and c are objects / components, and 0 and 1 are their sinks and sources, but in other cases it isn't that explicit, so I'm confused.

Yep, that earlier finding looks like my mistake.

lyakh · 2024-06-05T08:00:30Z

tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf

+                                sink 'eqiir.4.1'
+                        }
+                        {
+                                source 'module-copier.4.2'


e.g. here there's no explicit route from eqiir.4.1 to module-copier.4.2 because it's implicit inside the pipeline number 4?

lyakh · 2024-06-05T08:01:52Z

tools/topology/topology2/platform/intel/dmic-generic.conf

+                        channels_max $DMIC0_PCM_CHANNELS
+                        rate_min $DMIC0_RATE
+                        rate_max $DMIC0_RATE
+                }


replacing TABs with spaces?

This change prepares for adding it instead to DMIC DAI copier pipeline. There it will control mute/unmute for all possible module copier connected other capture PCMs. The pipeline object gain-capture is replaced with simpler host-gateway-capture. The definition of DMIC0_HOST_PIPELINE_SINK need to be changed from gain to host-copier. With this patch, the typical DMIC capture path looks like: dai-copier --> eqiir --> module-copier --> host-copier Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This change adds volume and switch "Dmic0" into dai-copier pipeline. It ensures that all capture from DMIC follows the mute key control even if some other processing and PCMs are added to module copier. The patch adds a new pipeline class dai-copier-eqiir-gain-module-copier-capture. It is similar as replaced dai-copier-eqiir-module-copier-capture but adds the gain component. The confusing DMIC0_DAI_GAIN (set to eqiir) is removed from all top level topologies (nocodec, rt5682, sdw, hda). After this a typical DMIC0 pipeline looks like: dai-copier --> eqiir --> gain --> module-copier --> host-copier Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch updates similarly as for hda-generic the analog capture. Before the patch the capture path pipelines are: dai-copier.HDA.Analog.capture --> host-copier.0.capture After this change: dai-copier.HDA.Analog.capture --> eqiir.4.1 --> module-copier.4.2 --> host-copier.0.capture To use the same dai-copier-eqiir-module-copier-capture tplg code chunk as in hda-generic, the macros HDA_ANALOG_CAPTURE and HDA_ANALOG_PLAYBACK_RATE were added. The addition of IIR to capture mitigates the capture start transients similarly as in hda-generic. This change adds 7.7 MCPS from IIR, and 2.2 MCPS from module-copier in TGL platform. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This change allows to disable and hide the control by omitting name define if it is not useful in the topology. Also other ALSA controls no more require mandatory name. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch adds a number of configuration blobs for the time-domain fixed beamformer component. The blobs include pass-through and generic narrow angle stereo beamforming for two and four microphones line array systems. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch adds a DRC blob for DMIC capture and renames the speaker blob. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch adds to analog microphone capture pipeline TDFB beamformer and DRC for dynamic range control. The name of updated topology is sof-hda-efx-generic.tplg. Similar capture enhance is added to multi-band DRC version sof-hda-efx-mbdrc-generic.tplg. The pipeline is enabled if HDA_MIC_ENHANCED_CAPTURE is set to true in topologies build. They keys EFX_HDA_MIC_TDFB_PARAMS and EFX_HDA_MIC_DRC_PARAMS control the configurations blobs use. There is no processing applied to capture audio since the topology is built with passthrough blobs. E.g. UCM should set up processing with blobs those have effect. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch adds to DMIC0 capture TDFB beamformer and DRC for dynamic range control. The names of updated topologies are sof-hda-efx-generic-2ch.tplg and sof-hda-efx-generic-4ch. The efx topologies with mbdrc are updated similarly. The pipeline is enabled if DMIC0_ENHANCED_CAPTURE is set to true in topologies build. They keys EFX_DMIC0_TDFB_PARAMS and EFX_DMIC0_DRC_PARAMS control the configurations blobs use. Build parameter DMIC0_PCM_CHANNELS controls the number of output channels for beamformer. It is by default two. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

lyakh

Maybe I'm missing something and what's really needed is an updated documentation :-)

lyakh · 2024-06-06T07:08:56Z

...s/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-gain-module-copier-capture.conf

+		route.2 {
+			source	eqiir.$index.1
+			sink	gain.$index.1
+		}


the route from eq-iir to the DAI isn't needed?

lyakh · 2024-06-06T07:21:44Z

tools/topology/topology2/platform/intel/dmic-generic.conf

@@ -289,7 +336,7 @@ IncludeByKey.PASSTHROUGH {
 		Object.Base.route [
 			{
 				source $DMIC0_DAI_COPIER
-				sink $DMIC0_DAI_GAIN
+				sink eqiir.$DMIC0_DAI_PIPELINE_ID.1


not saying that this is wrong, I must be missing something about how these routes should be added. I see 4 "widgets" in this pipeline: DAI copier, module copier, eq-iir and gain, and I see only 2 connections: from the DAI copier to eq-iir (not to the module copier?) and apparently from this whole DAI pipeline to a host sink pipeline. No need for all the other routes?

lgirdwood · 2024-07-25T15:03:58Z

SOFCI TEST

singalsu · 2024-08-14T09:43:23Z

Previous jenkins failures https://sof-ci.01.org/sofpr/PR9176/build6696/devicetest/index.html https://sof-ci.01.org/sofpr/PR9176/build6694/devicetest/index.html

singalsu · 2024-08-14T09:43:32Z

SOFCI TEST

lgirdwood · 2024-08-14T14:23:16Z

Previous jenkins failures https://sof-ci.01.org/sofpr/PR9176/build6696/devicetest/index.html https://sof-ci.01.org/sofpr/PR9176/build6694/devicetest/index.html

@singalsu this isn't touching Zephyr build failures, everything else look OK.

singalsu commented May 30, 2024

View reviewed changes

singalsu mentioned this pull request May 30, 2024

Tools: Topology2: Move in DMIC capture gain from host to dai pipeline #9154

Closed

singalsu marked this pull request as ready for review May 30, 2024 14:47

singalsu requested review from ranj063 and jsarha as code owners May 30, 2024 14:47

singalsu requested review from ujfalusi, lgirdwood, ranj063, jsarha, kv2019i and plbossart and removed request for jsarha and ranj063 May 30, 2024 14:48

kv2019i approved these changes Jun 4, 2024

View reviewed changes

lyakh reviewed Jun 5, 2024

View reviewed changes

singalsu added 7 commits June 5, 2024 12:32

Tools: Topology2: Add default DRC blobs

38e173b

This patch adds a DRC blob for DMIC capture and renames the speaker blob. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

singalsu force-pushed the tplg2_add_dmic_hda_tdfb_drc_capture branch from 4cdb8a7 to e032bd3 Compare June 5, 2024 10:20

singalsu force-pushed the tplg2_add_dmic_hda_tdfb_drc_capture branch from e032bd3 to 450a841 Compare June 5, 2024 11:44

singalsu requested a review from lyakh June 5, 2024 11:45

lyakh reviewed Jun 6, 2024

View reviewed changes

lgirdwood approved these changes Jun 7, 2024

View reviewed changes

lgirdwood merged commit 8836612 into thesofproject:main Aug 14, 2024
37 of 46 checks passed

singalsu deleted the tplg2_add_dmic_hda_tdfb_drc_capture branch August 21, 2024 08:01

singalsu mentioned this pull request Aug 27, 2024

[DNM] Tools: Topology2: Add DMIC Enhanced Audio Capture development tplg #9146

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tools: Topology2: Add enhanced audio capture development topologies #9176

Tools: Topology2: Add enhanced audio capture development topologies #9176

singalsu commented May 30, 2024 •

edited

Loading

singalsu May 30, 2024

singalsu May 30, 2024

kv2019i left a comment

kv2019i Jun 4, 2024

singalsu Jun 4, 2024

kv2019i Jun 5, 2024

lyakh Jun 4, 2024

singalsu Jun 5, 2024

lyakh Jun 5, 2024

singalsu Jun 5, 2024

lyakh Jun 5, 2024

singalsu Jun 5, 2024

lyakh Jun 5, 2024

singalsu Jun 5, 2024

lyakh left a comment

lyakh Jun 6, 2024

lyakh Jun 6, 2024

lgirdwood commented Jul 25, 2024

singalsu commented Aug 14, 2024

singalsu commented Aug 14, 2024

lgirdwood commented Aug 14, 2024

Tools: Topology2: Add enhanced audio capture development topologies #9176

Tools: Topology2: Add enhanced audio capture development topologies #9176

Conversation

singalsu commented May 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kv2019i left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lyakh left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lgirdwood commented Jul 25, 2024

singalsu commented Aug 14, 2024

singalsu commented Aug 14, 2024

lgirdwood commented Aug 14, 2024

singalsu commented May 30, 2024 •

edited

Loading