[Stable v1.7] backport for v1.7 final release.

src/audio/codec_adapter/CMakeLists.txt

@@ -1,10 +1,16 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
 add_local_sources(sof codec_adapter.c codec/generic.c)
+
 if(CONFIG_CADENCE_CODEC)
 add_local_sources(sof codec/cadence.c)
 endif()
 
 if(CONFIG_DUMMY_CODEC)
 add_local_sources(sof codec/dummy.c)
 endif()
+
+if(CONFIG_WAVES_CODEC)
+add_local_sources(sof codec/waves.c)
+sof_add_static_library(MaxxChrome ${CMAKE_CURRENT_LIST_DIR}/lib/release/libMaxxChrome.a)
+endif()

src/audio/codec_adapter/Kconfig

@@ -18,4 +18,13 @@ menu "Codec Adapter codecs"
 		  Select for a dummy API codec implementation.
 		  This will cause codec adapter component to include header
 		  files specific to DUMMY base codecs.
+
+	config WAVES_CODEC
+	bool "Waves codec"
+	default n
+	help
+		Select to include Waves codec. Waves codec implements MaxxEffect API.
+		API definition together with pre-compiled library is shared by Waves Audio Ltd.
+		If library is not provided will result in compilation error.
+		For more information, contact consumer@waves.com.
 endmenu

src/audio/codec_adapter/codec/cadence.c

@@ -50,7 +50,7 @@ int cadence_codec_init(struct comp_dev *dev)
 	/* Find and assign API function */
 	for (i = 0; i < no_of_api; i++) {
 		if (cadence_api_table[i].id == api_id) {
-			cd->api = cadence_api_table[0].api;
+			cd->api = cadence_api_table[i].api;
 			break;
 		}
 	}
@@ -97,7 +97,7 @@ int cadence_codec_init(struct comp_dev *dev)
 
 static int apply_config(struct comp_dev *dev, enum codec_cfg_type type)
 {
-	int ret;
+	int ret = 0;
 	int size;
 	struct codec_config *cfg;
 	void *data;
@@ -133,14 +133,16 @@ static int apply_config(struct comp_dev *dev, enum codec_cfg_type type)
 		if (ret != LIB_NO_ERROR) {
 			comp_err(dev, "apply_config() error %x: failed to apply parameter %d value %d",
 				 ret, param->id, *(int32_t *)param->data);
-			goto ret;
+			if (LIB_IS_FATAL_ERROR(ret))
+				goto ret;
 		}
 		/* Obtain next parameter, it starts right after the preceding one */
 		data = (char *)data + param->size;
 		size -= param->size;
 	}
 
 	comp_dbg(dev, "apply_config() done");
+	ret  = 0;
 ret:
 	return ret;
 }

src/audio/codec_adapter/codec/generic.c

@@ -182,8 +182,7 @@ int codec_free_memory(struct comp_dev *dev, void *ptr)
 	struct list_item *_mem_list;
 
 	if (!ptr) {
-		comp_err(dev, "codec_free_memory: error: NULL pointer passed.");
-		return -EINVAL;
+		return 0;
 	}
 	/* Find which container keeps this memory */
 	list_for_item_safe(mem_list, _mem_list, &cd->codec.memory.mem_list) {
@@ -229,17 +228,17 @@ int codec_prepare(struct comp_dev *dev)
 		goto end;
 	}
 
-	codec->s_cfg.avail = false;
-	codec->r_cfg.avail = false;
-	codec->r_cfg.data = NULL;
-
 	/* After prepare is done we no longer need runtime configuration
 	 * as it has been applied during the procedure - it is safe to
 	 * free it.
 	 */
 	if (codec->r_cfg.data)
 		rfree(codec->r_cfg.data);
 
+	codec->s_cfg.avail = false;
+	codec->r_cfg.avail = false;
+	codec->r_cfg.data = NULL;
+
 	codec->state = CODEC_PREPARED;
 	comp_dbg(dev, "codec_prepare() done");
 end: