Tools: Topology2: Add SRC component to cavs-nocodec.conf topologies #7547

singalsu · 2023-05-02T14:04:55Z

This patch adds 8 - 192 kHz playback and capture SRC to nocodec topologies such sof-tgl-nocodec.tplg. It enables testing of SRC component with IPC4.

singalsu · 2023-05-02T14:06:26Z

The topology sof-tgl-nocodec.tplg after change, see pipelines for copier.host.5.1 and copier.host.11.1:

Updated picture after rebase & conflict fix:

plbossart

Good idea to add SRC @singalsu, see a couple of comments below.

tools/topology/topology2/include/components/src.conf

tools/topology/topology2/include/components/src_format_host_capture.conf

tools/topology/topology2/include/pipelines/cavs/host-src-capture.conf

ranj063 · 2023-05-04T17:44:34Z

@singalsu you need the kernel patches first before this tplg change right?

singalsu · 2023-05-09T11:05:27Z

@singalsu you need the kernel patches first before this tplg change right?

Yep, it can't work without your PR

SRC fixes linux#4341 .

tools/topology/topology2/cavs-nocodec.conf

tools/topology/topology2/include/components/src_format_s32_to_sxx_convert.conf

ranj063 · 2023-06-02T17:26:06Z

SOFCI TEST

singalsu · 2023-06-13T09:40:13Z

No changes, rebase and push in hope to get all green result. Previous run had 43 successful, 1 failing (unrelated looking sof-ci/jenkins/per-device-test/main-ace fail.

singalsu · 2023-06-19T08:18:05Z

No changes, pushed again to see better success with CI.

kv2019i · 2023-06-19T11:01:26Z

Test speaker test is still failing https://sof-ci.01.org/sofpr/PR7547/build9796/devicetest/index.html?model=TGLU_RVP_NOCODEC_IPC4ZPH&testcase=test-speaker

kv2019i · 2023-06-21T09:33:35Z

@singalsu Let's file a but to https://github.com/thesofproject/sof-test/issues . I think we need a test case fix first to merge this as otherwise every PR test will fail to this and this can mask other bugs.

marc-hb · 2023-06-21T22:46:45Z

@singalsu Let's file a but to https://github.com/thesofproject/sof-test/issues .

Because it's the same organization, we can transfer issues from sof to sof-test in just one click, check the right side of this page.

singalsu · 2023-07-26T15:36:16Z

@lgirdwood @kv2019i Please prioritize since we have a testing gap for SRC component. This PR has been available since May.

singalsu · 2023-07-27T08:21:01Z

@lgirdwood @kv2019i Please prioritize since we have a testing gap for SRC component. This PR has been available since May.

Seems we have still the bug in alsabat speaker test CI script. For non-48 kHz rates it should not use -t wav but -t pink because the "left", "right" utterances wav files are for 48 kHz tests only. The pink noise test supports any rate. So need to put priority to fix CI to get green result for this PR.

lgirdwood · 2023-07-31T10:32:09Z

@singalsu pls ping when ready with test updates.

singalsu · 2023-08-15T06:57:14Z

@kv2019i Previous run, 45 successful and 2 unrelated failing checks, trying to get all green with new push. No changes.

lgirdwood · 2023-08-16T11:35:26Z

SOFCI TEST

lgirdwood · 2023-08-16T11:36:24Z

@singalsu rerunning CI, as a lot of red in the results so possibly a regression.

singalsu · 2023-08-16T12:10:08Z

@singalsu rerunning CI, as a lot of red in the results so possibly a regression.

Yes there seems to be a regression. FW crashes to exception with capture direction SRC.

lgirdwood · 2023-08-16T13:42:31Z

@singalsu rerunning CI, as a lot of red in the results so possibly a regression.

Yes there seems to be a regression. FW crashes to exception with capture direction SRC.

Can you merge @marcinszkudlinski SRC rate fix PR locally and retry, may be a dependecy.

singalsu · 2023-08-16T13:55:44Z

@singalsu rerunning CI, as a lot of red in the results so possibly a regression.

Yes there seems to be a regression. FW crashes to exception with capture direction SRC.

Can you merge @marcinszkudlinski SRC rate fix PR locally and retry, may be a dependecy.

It doesn't help. There's something else wrong too.

btian1 · 2023-08-22T07:29:31Z

tools/topology/topology2/include/components/src_format_s32_to_sxx_convert.conf

@@ -0,0 +1,346 @@
+#src format array


May I know the SRC module real capability? I mean does it really support all input format --> output format sample rate converter?

You can see the conversions matrix in https://github.com/thesofproject/sof/blob/main/tools/tune/src/src_ipc4_int32.m. There are not many unsupported in/out rates, those zeros.

btian1 · 2023-08-22T07:31:31Z

tools/topology/topology2/cavs-nocodec.conf

 #
 # PCM1 ---> gain ---> Mixin ---> Mixout ---> gain ---> SSP1
-# PCM2 ---> gain ---> Mixin ---> Mixout ---> gain ---> SSP2
+# PCM2 ---> SRC  ---> Mixin ---> Mixout ---> gain ---> SSP2


in your tplg, PCM2-->gain-->SRC?

Ah yes, I need to fix the comment.

This patch removes rule to require fixed rate_out for SRC widget. A capture SRC in host pipeline or near it has typically variable output rate. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

This patch replaces src_format.conf and src_passthrough_format.conf with more specific formats definitions for host copiers, pass-through components, playback src, and capture src. The DSP internal pipelines are 32 bits, so src_s32_passthrough.conf is used for components like gain those pass the 8 - 192 kHz rates with s32 format. The formats in src_format_sxx_to_s32_convert.conf is for use for for playback host copier. Input formats are s16/24/32 and the only output format is s32. Similarly the src_format_s32_to_sxx_convert.conf is for capture host copier. The formats for playback SRC are in src_format_s32_convert_to_48k.conf, and the formats for capture are in src_format_s32_convert_from_48k.conf. The new formats definitions use the input_audio_format and output_audio_format objects instead of audio_format. The unnecessary word lengths are removed to minimize the formats count in every component. The pipelines host-copier-gain-src-mixin-playback.conf and src-gain-mixin-playback.conf those used the previous format definitions are updated with these changes. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

singalsu · 2023-09-01T18:32:51Z

CI result "46 successful and 1 failing checks". Failed is sparse and this is all topology so not related.

I'll fix next the comment issue found by @btian1 .

This patch adds 8 - 192 kHz playback and capture SRC to nocodec topologies such sof-tgl-nocodec.tplg. It enables testing of SRC component with IPC4 via the SSP loopback in the nocodec topologies E.g. Play random noise at 44.1 kHz and capture it as 32 kHz. The SSP loopback runs internally at 48 kHz. aplay -Dhw:0,2 -f S32_LE -c 2 -r 44100 -d 10 -t raw /dev/random arecord -Dhw:0,2 -f S16_LE -c 2 -r 32000 -d 10 /tmp/recording.wav Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

singalsu · 2023-09-04T07:54:25Z

Nice, "46 successful and 1 failing checks", the failing sparse is not related.

plbossart reviewed May 2, 2023

View reviewed changes

singalsu force-pushed the nocodec_tplg2_add_src branch from 4639ad6 to 71a1a68 Compare May 5, 2023 16:22

singalsu mentioned this pull request May 8, 2023

SRC fixes thesofproject/linux#4341

Merged

singalsu force-pushed the nocodec_tplg2_add_src branch from 71a1a68 to 6af9726 Compare May 9, 2023 11:02

singalsu marked this pull request as ready for review May 9, 2023 11:05

singalsu requested a review from jsarha as a code owner May 9, 2023 11:05

singalsu requested review from andrula-song, kv2019i, lgirdwood, plbossart and ranj063 May 9, 2023 11:06

singalsu mentioned this pull request May 9, 2023

[FEATURE] Include SRC tests to nocodec topology tests thesofproject/sof-test#1035

Open

singalsu force-pushed the nocodec_tplg2_add_src branch from 6af9726 to 938ad4d Compare May 15, 2023 10:11

ranj063 reviewed May 16, 2023

View reviewed changes

tools/topology/topology2/cavs-nocodec.conf Outdated Show resolved Hide resolved

singalsu force-pushed the nocodec_tplg2_add_src branch 2 times, most recently from d7ed044 to 457b0d3 Compare May 24, 2023 10:20

plbossart reviewed May 25, 2023

View reviewed changes

tools/topology/topology2/include/components/src_format_s32_to_sxx_convert.conf Outdated Show resolved Hide resolved

singalsu force-pushed the nocodec_tplg2_add_src branch from 457b0d3 to fa682bf Compare June 1, 2023 09:30

singalsu requested review from plbossart and ranj063 June 1, 2023 09:31

ranj063 approved these changes Jun 2, 2023

View reviewed changes

singalsu force-pushed the nocodec_tplg2_add_src branch from fa682bf to 355c979 Compare June 13, 2023 09:37

singalsu force-pushed the nocodec_tplg2_add_src branch from 355c979 to 795000b Compare June 19, 2023 08:16

singalsu mentioned this pull request Jul 26, 2023

Revert "Audio: SRC: Add safeguard against missing, wrong size or type… #7985

Merged

singalsu force-pushed the nocodec_tplg2_add_src branch from 795000b to 86117b2 Compare July 26, 2023 15:32

singalsu force-pushed the nocodec_tplg2_add_src branch from 86117b2 to 75f5f50 Compare August 7, 2023 08:37

singalsu mentioned this pull request Aug 14, 2023

src: bugfix: rate for sink not set #8032

Merged

singalsu force-pushed the nocodec_tplg2_add_src branch 2 times, most recently from 7ce166a to 0e83c1c Compare August 15, 2023 09:23

lgirdwood approved these changes Aug 16, 2023

View reviewed changes

btian1 reviewed Aug 22, 2023

View reviewed changes

btian1 mentioned this pull request Aug 24, 2023

ipc4: handler: Split the set_pipeline_state() #8084

Merged

singalsu added 2 commits September 1, 2023 17:58

Tools: Topology2: No mandatory rate_out to support capture SRC

f711a02

This patch removes rule to require fixed rate_out for SRC widget. A capture SRC in host pipeline or near it has typically variable output rate. Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

singalsu force-pushed the nocodec_tplg2_add_src branch from 0e83c1c to 2fdf3e9 Compare September 1, 2023 14:59

singalsu force-pushed the nocodec_tplg2_add_src branch from 2fdf3e9 to d97a963 Compare September 1, 2023 18:40

singalsu requested a review from btian1 September 1, 2023 18:41

lgirdwood approved these changes Sep 1, 2023

View reviewed changes

kv2019i merged commit 2a7a94d into thesofproject:main Sep 5, 2023

Tools: Topology2: Add SRC component to cavs-nocodec.conf topologies #7547

Tools: Topology2: Add SRC component to cavs-nocodec.conf topologies #7547

Uh oh!

Conversation

singalsu commented May 2, 2023

Uh oh!

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

Uh oh!

Uh oh!

plbossart left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ranj063 commented May 4, 2023

Uh oh!

singalsu commented May 9, 2023 • edited by marc-hb Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ranj063 commented Jun 2, 2023

Uh oh!

singalsu commented Jun 13, 2023

Uh oh!

singalsu commented Jun 19, 2023

Uh oh!

kv2019i commented Jun 19, 2023

Uh oh!

kv2019i commented Jun 21, 2023

Uh oh!

marc-hb commented Jun 21, 2023

Uh oh!

singalsu commented Jul 26, 2023

Uh oh!

singalsu commented Jul 27, 2023

Uh oh!

lgirdwood commented Jul 31, 2023

Uh oh!

singalsu commented Aug 15, 2023

Uh oh!

lgirdwood commented Aug 16, 2023

Uh oh!

lgirdwood commented Aug 16, 2023

Uh oh!

singalsu commented Aug 16, 2023

Uh oh!

lgirdwood commented Aug 16, 2023

Uh oh!

singalsu commented Aug 16, 2023

Uh oh!

btian1 Aug 22, 2023

Choose a reason for hiding this comment

Uh oh!

singalsu Sep 1, 2023

Choose a reason for hiding this comment

Uh oh!

btian1 Aug 22, 2023

Choose a reason for hiding this comment

Uh oh!

singalsu Sep 1, 2023

Choose a reason for hiding this comment

Uh oh!

singalsu Sep 1, 2023

Choose a reason for hiding this comment

Uh oh!

singalsu commented Sep 1, 2023

Uh oh!

singalsu commented Sep 4, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

singalsu commented May 2, 2023 •

edited

Loading

singalsu commented May 9, 2023 •

edited by marc-hb

Loading