Skip to content

Conversation

@ranj063
Copy link
Collaborator

@ranj063 ranj063 commented Aug 7, 2024

Use the new feature in the topology compiler to extend the base class definitions to modify the pipelines that simply extend the pipeline with one or more widgets.

ranj063 added 3 commits August 7, 2024 11:41
Modify the route description to an array in preparation for allowing
class extensions to define new classes where existing routes will be
merged with the new routes in the sub classes.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Add a new pipeline, mixout-gain-eqiir-eqfir, that uses the new alsa-utils
topology feature to allow extending existing pipeline definitions. This
new class extends the base class mixout-gain-dai-copier-playback class
by adding the eqiir & eqfir widgets along with the new routes.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Modify the class definitions for the mixout-gain-efx-dai-copier-playback
and the mixout-gain-efx-mbdrc-dai-copier-playback pipelines to use the
SubreeCopy feature to extend the mixout-gain-eqiir-eqfir pipeline class
definition.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
@ranj063 ranj063 requested a review from jsarha as a code owner August 7, 2024 19:11
@ranj063 ranj063 requested review from plbossart and singalsu August 7, 2024 19:11
@plbossart
Copy link
Member

@fredoh9 @ranj063 do we need an update of the docker tools for this PR?

@ranj063
Copy link
Collaborator Author

ranj063 commented Aug 8, 2024

@fredoh9 @ranj063 do we need an update of the docker tools for this PR?

It's already done @plbossart

@wszypelt
Copy link

wszypelt commented Aug 9, 2024

@ranj063
Internal Intel CI System/merge/build tools failed

10:28:56,601 INFO  - ALSA lib pre-process-object.c:2084:(tplg_pre_process_objects) Error building object Pipeline.mixout-gain-efx-dai-copier-playback.0
10:28:56,601 INFO  -
10:28:56,601 INFO  - Unable to pre-process configuration
10:28:56,602 INFO  - make[2]: *** [topology/topology2/production/CMakeFiles/topology2_prod_sof-hda-generic-ace1-2ch.dir/build.make:75: topology/topology2/production/sof-hda-generic-ace1-2ch.tplg] Error 1
10:28:56,602 INFO  - make[1]: *** [CMakeFiles/Makefile2:5185: topology/topology2/production/CMakeFiles/topology2_prod_sof-hda-generic-ace1-2ch.dir/all] Error 2
10:28:56,603 INFO  - make: *** [Makefile:136: all] Error 2
10:28:56,607 INFO  - Executing post-execute action...

@plbossart
Copy link
Member

@wszypelt did you update the docker tools in the CI system? It's expected to fail if you try to build the updated topology without the updated tools.

@fredoh9
Copy link
Contributor

fredoh9 commented Aug 9, 2024

New docker image is updated in Aug 6th.
DIGEST= 6a2a690d1675bc114d162ea3cd8397a86d7aba932b63bb4f5f0f71d2e1f0be88
IMAGEID= 71eddd14c9d9

@lgirdwood
Copy link
Member

@wszypelt @lrudyX not expecting this to fail as its topology- good to merge ?
@kv2019i good for you ?

@wszypelt
Copy link

@lgirdwood we still need time to update docker, I'll let you know as soon as I get it done

@ranj063 ranj063 mentioned this pull request Aug 14, 2024
Copy link
Collaborator

@kv2019i kv2019i left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, took a bit long to review, but looks good to me. The syntax will take some to get used to, but these examples will help with that. Would be good to have ack from @singalsu as this is modifying the efx development tplgs.

Object.Control.bytes."1" {
IncludeByKey.EFX_IIR_PARAMS {
"passthrough" "include/components/eqiir/passthrough.conf"
SubTreeCopy.baseclass {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be nice to have some alsa-conf language version. The error you get now when building with too old alsa-utils is not very user-friendyl.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kv2019i but this doesnt add anything new in alsaconf. All changes are limited to alsatopology but we dont have versioning for that though

Copy link
Collaborator

@singalsu singalsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work! This worked perfectly when I tried with new build of sof-hda-efx-generic-4ch.tplg.

@kv2019i
Copy link
Collaborator

kv2019i commented Aug 16, 2024

Ready to go once Intel CI System has updated topology toolchain.

@wszypelt
Copy link

@ranj063 @fredoh9 @lgirdwood @kv2019i @plbossart docker at Intel Ci system has been updated :)

@lgirdwood lgirdwood merged commit b5c91d4 into thesofproject:main Aug 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants