diff --git a/src/audio/codec_adapter/CMakeLists.txt b/src/audio/codec_adapter/CMakeLists.txt index c4963dc844f3..e4da880d4576 100644 --- a/src/audio/codec_adapter/CMakeLists.txt +++ b/src/audio/codec_adapter/CMakeLists.txt @@ -6,8 +6,8 @@ if(CONFIG_CADENCE_CODEC) add_local_sources(sof codec/cadence.c) endif() -if(CONFIG_DUMMY_CODEC) -add_local_sources(sof codec/dummy.c) +if(CONFIG_PASSTHROUGH_CODEC) +add_local_sources(sof codec/passthrough.c) endif() if(CONFIG_WAVES_CODEC) diff --git a/src/audio/codec_adapter/Kconfig b/src/audio/codec_adapter/Kconfig index 291146744ec5..d063f964fb2b 100644 --- a/src/audio/codec_adapter/Kconfig +++ b/src/audio/codec_adapter/Kconfig @@ -63,13 +63,13 @@ if CADENCE_CODEC api symbol. endif - config DUMMY_CODEC - bool "Dummy codec" + config PASSTHROUGH_CODEC + bool "Passthrough codec" default n help - Select for a dummy API codec implementation. + Select for a passthrough API codec implementation. This will cause codec adapter component to include header - files specific to DUMMY base codecs. + files specific to PASSTHROUGH base codecs. config WAVES_CODEC bool "Waves codec" diff --git a/src/audio/codec_adapter/codec/dummy.c b/src/audio/codec_adapter/codec/passthrough.c similarity index 56% rename from src/audio/codec_adapter/codec/dummy.c rename to src/audio/codec_adapter/codec/passthrough.c index 6aceb7ab682a..807794fcf823 100644 --- a/src/audio/codec_adapter/codec/dummy.c +++ b/src/audio/codec_adapter/codec/passthrough.c @@ -4,34 +4,34 @@ // // Author: Daniel Baluta // -// Dummy codec implementation to demonstrate Codec Adapter API +// Passthrough codec implementation to demonstrate Codec Adapter API #include -#include +#include -int dummy_codec_init(struct comp_dev *dev) +int passthrough_codec_init(struct comp_dev *dev) { - comp_info(dev, "dummy_codec_init() start"); + comp_info(dev, "passthrough_codec_init() start"); return 0; } -int dummy_codec_prepare(struct comp_dev *dev) +int passthrough_codec_prepare(struct comp_dev *dev) { struct codec_data *codec = comp_get_codec(dev); struct comp_data *cd = comp_get_drvdata(dev); - comp_info(dev, "dummy_codec_process()"); + comp_info(dev, "passthrough_codec_process()"); codec->cpd.in_buff = rballoc(0, SOF_MEM_CAPS_RAM, cd->period_bytes); if (!codec->cpd.in_buff) { - comp_err(dev, "dummy_codec_prepare(): Failed to alloc in_buff"); + comp_err(dev, "passthrough_codec_prepare(): Failed to alloc in_buff"); return -ENOMEM; } codec->cpd.in_buff_size = cd->period_bytes; codec->cpd.out_buff = rballoc(0, SOF_MEM_CAPS_RAM, cd->period_bytes); if (!codec->cpd.out_buff) { - comp_err(dev, "dummy_codec_prepare(): Failed to alloc out_buff"); + comp_err(dev, "passthrough_codec_prepare(): Failed to alloc out_buff"); rfree(codec->cpd.in_buff); return -ENOMEM; } @@ -40,12 +40,12 @@ int dummy_codec_prepare(struct comp_dev *dev) return 0; } -int dummy_codec_process(struct comp_dev *dev) +int passthrough_codec_process(struct comp_dev *dev) { struct codec_data *codec = comp_get_codec(dev); struct comp_data *cd = comp_get_drvdata(dev); - comp_dbg(dev, "dummy_codec_process()"); + comp_dbg(dev, "passthrough_codec_process()"); memcpy_s(codec->cpd.out_buff, codec->cpd.out_buff_size, codec->cpd.in_buff, codec->cpd.in_buff_size); @@ -54,27 +54,27 @@ int dummy_codec_process(struct comp_dev *dev) return 0; } -int dummy_codec_apply_config(struct comp_dev *dev) +int passthrough_codec_apply_config(struct comp_dev *dev) { - comp_info(dev, "dummy_codec_apply_config()"); + comp_info(dev, "passthrough_codec_apply_config()"); /* nothing to do */ return 0; } -int dummy_codec_reset(struct comp_dev *dev) +int passthrough_codec_reset(struct comp_dev *dev) { - comp_info(dev, "dummy_codec_reset()"); + comp_info(dev, "passthrough_codec_reset()"); /* nothing to do */ return 0; } -int dummy_codec_free(struct comp_dev *dev) +int passthrough_codec_free(struct comp_dev *dev) { struct codec_data *codec = comp_get_codec(dev); - comp_info(dev, "dummy_codec_free()"); + comp_info(dev, "passthrough_codec_free()"); rfree(codec->cpd.in_buff); rfree(codec->cpd.out_buff); diff --git a/src/include/sof/audio/codec_adapter/codec/dummy.h b/src/include/sof/audio/codec_adapter/codec/dummy.h deleted file mode 100644 index 1489f2461334..000000000000 --- a/src/include/sof/audio/codec_adapter/codec/dummy.h +++ /dev/null @@ -1,18 +0,0 @@ -/* SPDX-License-Identifier: BSD-3-Clause - * - * Copyright 2020 NXP - * - * Author: Daniel Baluta - */ - -#ifndef __SOF_AUDIO_DUMMY_CODEC__ -#define __SOF_AUDIO_DUMMY_CODEC__ - -int dummy_codec_init(struct comp_dev *dev); -int dummy_codec_prepare(struct comp_dev *dev); -int dummy_codec_process(struct comp_dev *dev); -int dummy_codec_apply_config(struct comp_dev *dev); -int dummy_codec_reset(struct comp_dev *dev); -int dummy_codec_free(struct comp_dev *dev); - -#endif /* __SOF_AUDIO_DUMMY_CODEC__ */ diff --git a/src/include/sof/audio/codec_adapter/codec/passthrough.h b/src/include/sof/audio/codec_adapter/codec/passthrough.h new file mode 100644 index 000000000000..29b3e732424b --- /dev/null +++ b/src/include/sof/audio/codec_adapter/codec/passthrough.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * + * Copyright 2020 NXP + * + * Author: Daniel Baluta + */ + +#ifndef __SOF_AUDIO_PASSTHROUGH_CODEC__ +#define __SOF_AUDIO_PASSTHROUGH_CODEC__ + +int passthrough_codec_init(struct comp_dev *dev); +int passthrough_codec_prepare(struct comp_dev *dev); +int passthrough_codec_process(struct comp_dev *dev); +int passthrough_codec_apply_config(struct comp_dev *dev); +int passthrough_codec_reset(struct comp_dev *dev); +int passthrough_codec_free(struct comp_dev *dev); + +#endif /* __SOF_AUDIO_PASSTHROUGH_CODEC__ */