Skip to content

Prepare codec adapter to work with zephyr (1) #5384

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 3 commits into from
Feb 18, 2022
Merged

Prepare codec adapter to work with zephyr (1) #5384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1945cd5
codec_adapter: Fix trace format mismatches
dbaluta Feb 17, 2022
64216e3
codec_adapter: Fix DECLARE_CODEC_ADAPTER macro
dbaluta Feb 17, 2022
c4836cd
zephyr: add codec adapter components
dbaluta Feb 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/audio/codec_adapter/codec/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ int module_free_memory(struct processing_module *mod, void *ptr)
}

comp_err(mod->dev, "module_free_memory: error: could not find memory pointed by %p",
(uint32_t)ptr);
ptr);

return -EINVAL;
}
Expand Down Expand Up @@ -398,7 +398,7 @@ int module_set_configuration(struct processing_module *mod,

ret = memcpy_s(dst, size - offset, fragment, fragment_size);
if (ret < 0) {
comp_err(dev, "module_set_configuration(): error: failed to copy fragment",
comp_err(dev, "module_set_configuration(): error: %d failed to copy fragment",
ret);
return ret;
}
Expand Down
4 changes: 2 additions & 2 deletions src/include/sof/audio/codec_adapter/codec/generic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@ static SHARED_DATA struct comp_driver_info comp_codec_adapter_info = { \
.drv = &comp_codec_adapter, \
}; \
\
UT_STATIC void sys_comp_codec_##adapter_init(void) \
UT_STATIC void sys_comp_codec_##adapter##_init(void) \
{ \
comp_register(platform_shared_get(&comp_codec_adapter_info, \
sizeof(comp_codec_adapter_info))); \
} \
\
DECLARE_MODULE(sys_comp_codec_##adapter_init)
DECLARE_MODULE(sys_comp_codec_##adapter##_init)

struct processing_module;

Expand Down
14 changes: 14 additions & 0 deletions zephyr/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,6 +609,20 @@ zephyr_library_sources_ifdef(CONFIG_COMP_VOLUME
${SOF_AUDIO_PATH}/volume/volume.c
)

zephyr_library_sources_ifdef(CONFIG_COMP_CODEC_ADAPTER
${SOF_AUDIO_PATH}/codec_adapter/codec_adapter.c
${SOF_AUDIO_PATH}/codec_adapter/codec/generic.c
)

if (CONFIG_COMP_CODEC_ADAPTER)
zephyr_library_sources_ifdef(CONFIG_CADENCE_CODEC
${SOF_AUDIO_PATH}/codec_adapter/codec/cadence.c
)
zephyr_library_sources_ifdef(CONFIG_PASSTHROUGH_CODEC
${SOF_AUDIO_PATH}/codec_adapter/codec/passthrough.c
)
endif()

zephyr_library_sources_ifdef(CONFIG_COMP_SRC
${SOF_AUDIO_PATH}/src/src_hifi2ep.c
${SOF_AUDIO_PATH}/src/src_generic.c
Expand Down
10 changes: 10 additions & 0 deletions zephyr/wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,8 @@ void sys_comp_kpb_init(void);
void sys_comp_smart_amp_init(void);
void sys_comp_basefw_init(void);
void sys_comp_copier_init(void);
void sys_comp_codec_cadence_interface_init(void);
void sys_comp_codec_passthrough_interface_init(void);

/* Zephyr redefines log_message() and mtrace_printf() which leaves
* totally empty the .static_log_entries ELF sections for the
Expand Down Expand Up @@ -640,6 +642,14 @@ int task_main_start(struct sof *sof)
sys_comp_copier_init();
}

if (IS_ENABLED(CONFIG_CADENCE_CODEC)) {
sys_comp_codec_cadence_interface_init();
}

if (IS_ENABLED(CONFIG_PASSTHROUGH_CODEC)) {
sys_comp_codec_passthrough_interface_init();
}

/* init pipeline position offsets */
pipeline_posn_init(sof);

Expand Down