Skip to content

Rename codec_adapter to module_adapter #5593

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 18 commits into from
May 4, 2022
Merged

Rename codec_adapter to module_adapter #5593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
793e111
codec_adapter: Fix doxygen comment for file
ranj063 Mar 23, 2022
48a1df7
codec_adapter: rename codec_adapter_new
ranj063 Mar 23, 2022
ee2397c
codec_adapter: rename codec_adapter_prepare()
ranj063 Mar 23, 2022
8652ff7
codec_adapter: rename codec_adapter_params()
ranj063 Mar 23, 2022
05745b8
codec_adapter: rename codec_adapter_copy()
ranj063 Mar 23, 2022
151b233
codec_adapter: rename codec_adapter_set_params()
ranj063 Mar 23, 2022
9af18cb
codec_adapter: rename codec_adapter_ctrl_set_data()
ranj063 Mar 23, 2022
fc27e97
codec_adapter: rename codec_adapter_cmd()
ranj063 Mar 23, 2022
2a1b7fe
codec_adapter: rename codec_adapter_trigger()
ranj063 Mar 23, 2022
b5fabd9
codec_adapter: rename codec_adapter_reset()
ranj063 Mar 23, 2022
f150310
codec_adapter: rename codec_adapter_free()
ranj063 Mar 23, 2022
ffc5d0c
codec_adapter: rename codec_adapter.h
ranj063 Mar 23, 2022
8dc8aae
codec_adapter: rename references to codec_adapter
ranj063 Mar 23, 2022
8398184
codec_adapter: rename DECLARE_CODEC_ADAPTER and comp_driver
ranj063 Mar 23, 2022
a050b51
codec_adapter: move CODEC_GET_API_ID definition
ranj063 Mar 23, 2022
30d685e
codec_adapter: rename codec_adapter.c to module_adapter.c
ranj063 Mar 23, 2022
5383b7d
codec_adapter: rename the codec folder to module
ranj063 Mar 23, 2022
2d0dd91
codec_adapter: rename it to module_adapter and fix all includes
ranj063 Mar 23, 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/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ if(NOT CONFIG_LIBRARY)
if(CONFIG_COMP_ASRC)
add_subdirectory(asrc)
endif()
if(CONFIG_COMP_CODEC_ADAPTER)
add_subdirectory(codec_adapter)
if(CONFIG_COMP_MODULE_ADAPTER)
add_subdirectory(module_adapter)
endif()
if(CONFIG_COMP_IGO_NR)
add_subdirectory(igo_nr)
Expand Down
8 changes: 4 additions & 4 deletions src/audio/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,18 +438,18 @@ config COMP_TDFB
for channels selection, channel filter coefficients, and output
streams mixing.

config COMP_CODEC_ADAPTER
bool "Codec adapter"
config COMP_MODULE_ADAPTER
bool "Module adapter"
default n
help
This component is an adapter between SoF components and any external third
party codecs/libraries. In order to make use of it the library itself should
be statically linked with the SoF FW binary image and the codec details, such as its
ID or specific methods provided in generic interface object located under
"src\include\sof\audio\codec_adapter\interfaces.h". It is possible to link several
"src\include\sof\audio\module_adapter\interfaces.h". It is possible to link several
different codecs and use them in parallel.

rsource "codec_adapter/Kconfig"
rsource "module_adapter/Kconfig"

config COMP_IGO_NR
bool "IGO NR component"
Expand Down
10 changes: 5 additions & 5 deletions src/audio/codec_adapter/CMakeLists.txt → src/audio/module_adapter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# SPDX-License-Identifier: BSD-3-Clause

add_local_sources(sof codec_adapter.c codec/generic.c)
add_local_sources(sof module_adapter.c module/generic.c)

if(CONFIG_CADENCE_CODEC)
add_local_sources(sof codec/cadence.c)
add_local_sources(sof module/cadence.c)

if(CONFIG_CADENCE_CODEC_WRAPPER)
sof_add_static_library(codec_wrapper_lib ${CONFIG_CADENCE_CODEC_WRAPPER_LIB})
Expand Down Expand Up @@ -48,18 +48,18 @@ endif()
endif()

if(CONFIG_PASSTHROUGH_CODEC)
add_local_sources(sof codec/passthrough.c)
add_local_sources(sof module/passthrough.c)
endif()

if(CONFIG_WAVES_CODEC)
add_local_sources(sof codec/waves.c)
add_local_sources(sof module/waves.c)
sof_add_static_library(MaxxChrome ${CMAKE_CURRENT_LIST_DIR}/lib/release/libMaxxChrome.a)
# folder with Waves API must be among include directories
target_include_directories(sof PUBLIC ${CMAKE_CURRENT_LIST_DIR}/../../include/sof/audio/)
endif()

if(CONFIG_DTS_CODEC)
add_local_sources(sof codec/dts.c)
add_local_sources(sof module/dts.c)
target_compile_definitions(sof PRIVATE -DDTS_MATH_INT32 -DDTS_XTENSA)
target_include_directories(sof PRIVATE ${CMAKE_CURRENT_LIST_DIR}/../../include/sof/audio/dts/)
sof_add_static_library(DtsCodec ${CMAKE_CURRENT_LIST_DIR}/lib/release/libdts-sof-interface-i32.a)
Expand Down
4 changes: 2 additions & 2 deletions src/audio/codec_adapter/Kconfig → src/audio/module_adapter/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: BSD-3-Clause

menu "Codec Adapter codecs"
visible if COMP_CODEC_ADAPTER
menu "Module Adapter codecs"
visible if COMP_MODULE_ADAPTER

config CADENCE_CODEC
bool "Cadence codec"
Expand Down
6 changes: 3 additions & 3 deletions src/audio/codec_adapter/codec/cadence.c → src/audio/module_adapter/module/cadence.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
*
*/

#include <sof/audio/codec_adapter/codec/generic.h>
#include <sof/audio/codec_adapter/codec/cadence.h>
#include <sof/audio/module_adapter/module/generic.h>
#include <sof/audio/module_adapter/module/cadence.h>
#include <ipc/compress_params.h>

/* d8218443-5ff3-4a4c-b388-6cfe07b956aa */
Expand Down Expand Up @@ -738,4 +738,4 @@ static struct module_interface cadence_interface = {
.free = cadence_codec_free
};

DECLARE_CODEC_ADAPTER(cadence_interface, cadence_uuid, cadence_tr);
DECLARE_MODULE_ADAPTER(cadence_interface, cadence_uuid, cadence_tr);
4 changes: 2 additions & 2 deletions src/audio/codec_adapter/codec/dts.c → src/audio/module_adapter/module/dts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Author: Mark Barton <mark.barton@xperi.com>

#include "sof/audio/codec_adapter/codec/generic.h"
#include "sof/audio/module_adapter/module/generic.h"

#include "DtsSofInterface.h"

Expand Down Expand Up @@ -426,4 +426,4 @@ static struct module_interface dts_interface = {
.free = dts_codec_free
};

DECLARE_CODEC_ADAPTER(dts_interface, dts_uuid, dts_tr);
DECLARE_MODULE_ADAPTER(dts_interface, dts_uuid, dts_tr);
4 changes: 2 additions & 2 deletions src/audio/codec_adapter/codec/generic.c → src/audio/module_adapter/module/generic.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
*
*/

#include <sof/audio/codec_adapter/codec_adapter.h>
#include <sof/audio/module_adapter/module_adapter.h>

/*****************************************************************************/
/* Local helper functions */
Expand Down Expand Up @@ -313,7 +313,7 @@ int module_free(struct processing_module *mod)

/* Free all memory requested by module */
module_free_all_memory(mod);
/* Free all memory shared by codec_adapter & module */
/* Free all memory shared by module_adapter & module */
md->cfg.avail = false;
md->cfg.size = 0;
rfree(md->cfg.data);
Expand Down
4 changes: 2 additions & 2 deletions src/audio/codec_adapter/codec/passthrough.c → ...audio/module_adapter/module/passthrough.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
//
// Passthrough codec implementation to demonstrate Codec Adapter API

#include <sof/audio/codec_adapter/codec/generic.h>
#include <sof/audio/module_adapter/module/generic.h>

/* 376b5e44-9c82-4ec2-bc83-10ea101afa8f */
DECLARE_SOF_RT_UUID("passthrough_codec", passthrough_uuid, 0x376b5e44, 0x9c82, 0x4ec2,
Expand Down Expand Up @@ -122,4 +122,4 @@ static struct module_interface passthrough_interface = {
.free = passthrough_codec_free
};

DECLARE_CODEC_ADAPTER(passthrough_interface, passthrough_uuid, passthrough_tr);
DECLARE_MODULE_ADAPTER(passthrough_interface, passthrough_uuid, passthrough_tr);
4 changes: 2 additions & 2 deletions src/audio/codec_adapter/codec/waves.c → src/audio/module_adapter/module/waves.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
//
// Author: Oleksandr Strelchenko <oleksandr.strelchenko@waves.com>
//
#include <sof/audio/codec_adapter/codec/generic.h>
#include <sof/audio/module_adapter/module/generic.h>
#include <sof/debug/debug.h>
#include <sof/compiler_attributes.h>

Expand Down Expand Up @@ -865,4 +865,4 @@ static struct module_interface waves_interface = {
.free = waves_codec_free
};

DECLARE_CODEC_ADAPTER(waves_interface, waves_uuid, waves_tr);
DECLARE_MODULE_ADAPTER(waves_interface, waves_uuid, waves_tr);
Loading