Rename codec_adapter to module_adapter by ranj063 · Pull Request #5593 · thesofproject/sof

ranj063 · 2022-03-24T01:54:31Z

Just a whole lot of renames. No functional changes.

ranj063 · 2022-03-24T01:55:25Z

@dbaluta @kkarask Please note that the kconfig menu has changes to COMP_MODULE_ADAPTER with this PR.

keqiaozhang · 2022-03-24T02:28:31Z

SOFCI TEST

kv2019i

That has been some work to split this into small patches. But easy to review this way. I'd have been happy with one big patch as well.

kkarask · 2022-03-24T13:47:45Z

There is a need to change build file. We should sync to adjust this change to CI process.

dbaluta

This looks good to me, but I prefer to have the renaming done after my dynamic codec patches are in.

See:
#5596

ranj063 · 2022-04-13T16:19:57Z

There is a need to change build file. We should sync to adjust this change to CI process.

@kkarask can you please change the QB CI to use the new config CONFIG_MODULE_ADAPTER instead of CONFIG_CODEC_ADAPTER. It will be needed for this PR to pass.

kkarask · 2022-04-14T07:09:24Z

I will be ready today - is it ok?

ranj063 · 2022-04-14T15:33:44Z

I will be ready today - is it ok?

@kkarask sure, let me know if you have any other issues with this PR

lgirdwood · 2022-04-14T21:07:03Z

@dbaluta does this mean you are OK to merge whilst part 2 of your coded work is testing ? Just clarifying.

sys-pt1s · 2022-04-15T11:33:56Z

Can one of the admins verify this patch?

wszypelt · 2022-04-15T13:33:48Z

@ranj063 @sys-pt1s @lgirdwood @dbaluta
We ran the first tests, unfortunately the problem is probably still here:

Because we have errors with the file not found

ranj063 · 2022-04-15T15:00:06Z

Because we have errors with the file not found

@wszypelt what is the error you're seeing? Can you please paste the error log ? Is it during build?

dbaluta · 2022-04-18T07:28:55Z

@dbaluta does this mean you are OK to merge whilst part 2 of your coded work is testing ? Just clarifying.

@lgirdwood lets wait a little bit more time until we merge this PR. part 2 of my codec work has a problem with Intel internal tests and I will try to debug it but it will take a while.

Also, since @ranj063 is not in the office this week I don't think would be a problem to wait a little bit until we merge this current PR.

wszypelt · 2022-04-19T11:02:05Z

@ranj063 yes, the error occurs while building the codec FW

13:46:15,096 INFO - In file included from /quickbuild/workspace1/24733/SOF_FW/src/audio/module_adapter/module_adapter.c:16:
13:46:15,096 INFO - /quickbuild/workspace1/24733/SOF_FW/src/include/sof/audio/module_adapter/module_adapter.h:11:52: error: sof/audio/codec_adapter/module/generic.h: No such file or directory
13:46:15,100 INFO - CMakeFiles/sof.dir/build.make:995: recipe for target 'CMakeFiles/sof.dir/src/audio/module_adapter/module_adapter.c.o' failed
13:46:15,100 INFO - make[3]: *** [CMakeFiles/sof.dir/src/audio/module_adapter/module_adapter.c.o] Error 2

to module_adapter_trigger(). No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

to module_adapter_reset(). No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

to module_adapter_free(). No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

To module_adapter.h. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

to module_adapter. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

ranj063 · 2022-04-27T15:36:25Z

@ranj063 part 3 now merged so this PR is next.

@lgirdwood conflicts fixed now. @wszypelt could you please update the config in QB and retry this one?

to DECLARE_MODULE_ADAPTER and comp_driver to comp_module_adapter. Also rename SOF_COMP_MODULE_ADAPTER to SOF_COM_MODULE_ADAPTER. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

to cadence.h. It isn't used elsewhere. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

and fix all the includes accordingly. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

lgirdwood · 2022-04-27T18:15:46Z

@ranj063 can you check CI. Thanks !

ranj063 · 2022-04-27T18:20:23Z

@ranj063 can you check CI. Thanks !

Sure. I cant seem to load any of them but its also quite surprising the regular tests fail. This PR doesnt touch anything outside of the codec_adapter. @wszypelt any ideas?

lgirdwood · 2022-04-27T18:40:47Z

@ranj063 can you check CI. Thanks !
Sure. I cant seem to load any of them but its also quite surprising the regular tests fail. This PR doesnt touch anything outside of the codec_adapter. @wszypelt any ideas?

Could be the DUT needing a reboot ? @wszypelt good to merge ?

wszypelt · 2022-04-28T06:58:59Z

@lgirdwood @ranj063 Yes, one of the DUTs needed a reset, PR is under testing. there should be results soon.

wszypelt · 2022-04-28T07:41:57Z

@ranj063 @lgirdwood I don't really understand what happened, do we no longer need a configuration file change to get the codec build to work? (COMP_MODULE_ADAPTER) Even if, as you can see there was a problem with ipc error -22 on codec tests.

ranj063 · 2022-04-28T13:02:38Z

@ranj063 @lgirdwood I don't really understand what happened, do we no longer need a configuration file change to get the codec build to work? (COMP_MODULE_ADAPTER) Even if, as you can see there was a problem with ipc error -22 on codec tests.

@wszypelt yes, you do need a configuration change when building to include COMP_MODULE_ADAPTER and CADENCE_CODEC selected. Could you please send me the config from your build?

wszypelt · 2022-04-28T19:55:53Z

@ranj063 Unfortunately, the changes can be made together with the team from the internal service, additionally I'm now on ooo, back to work at Wednesday

dbaluta · 2022-05-04T05:49:22Z

@ranj063 thanks! Looks good to me.

lgirdwood · 2022-05-04T10:38:35Z

@wszypelt any ETA on CI updates ?

wszypelt · 2022-05-04T10:50:44Z

@lgirdwood The case was reported and explained, I am waiting for a move from the internal service, I hope that everything will be done within an hour.

wszypelt · 2022-05-04T14:02:18Z

@lgirdwood @ranj063
After many tries, it finally started to work! Quick merge please. Then I will be able run the rest of the pull requests

lgirdwood · 2022-05-04T15:01:33Z

@wszypelt merged

marc-hb · 2022-05-11T16:48:19Z

Fixed by

zephyr: Fix compile error after switching to module_adapter naming #5803

ranj063 requested review from RanderWang, cujomalainey, dbaluta, lbetlej, lgirdwood, marcinszkudlinski, mmaka1, mrajwa and plbossart as code owners March 24, 2022 01:54

ranj063 changed the title ~~Rename codec_adapter to module_adapter.~~Rename codec_adapter to module_adapterMar 24, 2022

kv2019i approved these changes Mar 24, 2022
View reviewed changes

dbaluta approved these changes Mar 24, 2022
View reviewed changes

paulstelian97 approved these changes Mar 24, 2022
View reviewed changes

dbaluta requested changes Mar 24, 2022
View reviewed changes

ranj063 force-pushed the fix/codec_bytes_to_process branch from fb8fb3c to 1076f2aCompare April 13, 2022 16:18

dbaluta approved these changes Apr 14, 2022
View reviewed changes

cujomalainey approved these changes Apr 15, 2022
View reviewed changes

ranj063 force-pushed the fix/codec_bytes_to_process branch from 1076f2a to b886a9aCompare April 25, 2022 17:20

ranj063 added 5 commits April 27, 2022 08:26

codec_adapter: rename codec_adapter_trigger()
2a1b7fe
to module_adapter_trigger(). No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename codec_adapter_reset()
b5fabd9
to module_adapter_reset(). No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename codec_adapter_free()
f150310
to module_adapter_free(). No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename codec_adapter.h
ffc5d0c
To module_adapter.h. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename references to codec_adapter
8dc8aae
to module_adapter. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

ranj063 force-pushed the fix/codec_bytes_to_process branch from b886a9a to f23fe0aCompare April 27, 2022 15:35

dbaluta approved these changes Apr 27, 2022
View reviewed changes

ranj063 added 5 commits April 27, 2022 09:07

codec_adapter: rename DECLARE_CODEC_ADAPTER and comp_driver
8398184
to DECLARE_MODULE_ADAPTER and comp_driver to comp_module_adapter. Also rename SOF_COMP_MODULE_ADAPTER to SOF_COM_MODULE_ADAPTER. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: move CODEC_GET_API_ID definition
a050b51
to cadence.h. It isn't used elsewhere. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename codec_adapter.c to module_adapter.c
30d685e
No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename the codec folder to module
5383b7d
and fix all the includes accordingly. No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

codec_adapter: rename it to module_adapter and fix all includes
2d0dd91
No functional changes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

ranj063 force-pushed the fix/codec_bytes_to_process branch from f23fe0a to 2d0dd91Compare April 27, 2022 16:08

dbaluta approved these changes May 4, 2022
View reviewed changes

lgirdwood merged commit b4591ca into thesofproject:mainMay 4, 2022

wszypelt mentioned this pull request May 4, 2022
k_usleep() and k_msleep() wrappers for xtos #5770
Merged

Uh oh!

Conversation

ranj063 commented Mar 24, 2022

Uh oh!

ranj063 commented Mar 24, 2022

Uh oh!

keqiaozhang commented Mar 24, 2022

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

kkarask commented Mar 24, 2022

Uh oh!

dbaluta left a comment

Choose a reason for hiding this comment

Uh oh!

ranj063 commented Apr 13, 2022

Uh oh!

kkarask commented Apr 14, 2022

Uh oh!

ranj063 commented Apr 14, 2022

Uh oh!

lgirdwood commented Apr 14, 2022

Uh oh!

sys-pt1s commented Apr 15, 2022

Uh oh!

wszypelt commented Apr 15, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ranj063 commented Apr 15, 2022

Uh oh!

dbaluta commented Apr 18, 2022

Uh oh!

wszypelt commented Apr 19, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ranj063 commented Apr 27, 2022

Uh oh!

lgirdwood commented Apr 27, 2022

Uh oh!

ranj063 commented Apr 27, 2022

Uh oh!

lgirdwood commented Apr 27, 2022

Uh oh!

wszypelt commented Apr 28, 2022

Uh oh!

wszypelt commented Apr 28, 2022

Uh oh!

ranj063 commented Apr 28, 2022

Uh oh!

wszypelt commented Apr 28, 2022

Uh oh!

dbaluta commented May 4, 2022

Uh oh!

lgirdwood commented May 4, 2022

Uh oh!

wszypelt commented May 4, 2022

Uh oh!

wszypelt commented May 4, 2022• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lgirdwood commented May 4, 2022

Uh oh!

marc-hb commented May 11, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

11 participants

wszypelt commented Apr 15, 2022•
edited
Loading

wszypelt commented Apr 19, 2022•
edited
Loading

wszypelt commented May 4, 2022•
edited
Loading