module_adapter:dts: support module life cycle change

joechengxperi · lgirdwood · commit a26f83c52f83 · 2022-12-07T13:47:03.000Z
1. Add a free memory function to support PR#6230 and PR#6331,
   the latest prepare/reset API flow update of module_adapter.
2. This requires DTS library v1.0.7 to support this change.

Signed-off-by: Joe.Cheng &lt;joe.cheng@xperi.com&gt;
diff --git a/src/audio/module_adapter/module/dts.c b/src/audio/module_adapter/module/dts.c
@@ -34,6 +34,21 @@ static void *dts_effect_allocate_codec_memory(void *mod_void, unsigned int lengt
 	return pMem;
 }
 
+static void dts_effect_free_codec_memory(void *mod_void, void *pMem)
+{
+	struct processing_module *mod = mod_void;
+	struct comp_dev *dev = mod->dev;
+
+	comp_dbg(dev, "dts_effect_free_codec_memory() start");
+
+	int ret = module_free_memory(mod, pMem);
+
+	if (ret)
+		comp_err(dev, "dts_effect_free_codec_memory() module_free_memory failed %d", ret);
+
+	comp_dbg(dev, "dts_effect_free_codec_memory() done");
+}
+
 static int dts_effect_convert_sof_interface_result(struct comp_dev *dev,
 	DtsSofInterfaceResult dts_result)
 {
@@ -136,7 +151,7 @@ static int dts_codec_init(struct processing_module *mod)
 	comp_dbg(dev, "dts_codec_init() start");
 
 	dts_result = dtsSofInterfaceInit((DtsSofInterfaceInst **)&(codec->private),
-		dts_effect_allocate_codec_memory, mod);
+		dts_effect_allocate_codec_memory, dts_effect_free_codec_memory, mod);
 	ret = dts_effect_convert_sof_interface_result(dev, dts_result);
 
 	if (ret)
diff --git a/src/include/sof/audio/dts/DtsSofInterface.h b/src/include/sof/audio/dts/DtsSofInterface.h
@@ -58,14 +58,17 @@ typedef struct DtsSofInterfaceBufferConfiguration
 } DtsSofInterfaceBufferConfiguration;
 
 typedef void* (*DtsSofInterfaceAllocateMemory)(
-	void* pMemoryAllocationContext,
-	unsigned int length,
-	unsigned int alignment);
+		void *pMemoryAllocationContext,
+		unsigned int length,
+		unsigned int alignment);
+
+typedef void (*DtsSofInterfaceFreeMemory)(void *pMemoryAllocationContext, void *pMemory);
 
 DtsSofInterfaceResult DTS_SOF_INTERFACE_API dtsSofInterfaceInit(
-	DtsSofInterfaceInst** ppInst,
-	DtsSofInterfaceAllocateMemory pMemoryAllocationFn,
-	void* MemoryAllocationContext) DTS_SOF_INTERFACE_NOEXCEPT;
+		DtsSofInterfaceInst           **ppInst,
+		DtsSofInterfaceAllocateMemory pMemoryAllocationFn,
+		DtsSofInterfaceFreeMemory     pMemoryFreeFn,
+		void                          *MemoryAllocationContext) DTS_SOF_INTERFACE_NOEXCEPT;
 
 DtsSofInterfaceResult DTS_SOF_INTERFACE_API dtsSofInterfacePrepare(
 	DtsSofInterfaceInst* pInst,
diff --git a/src/include/sof/audio/dts/DtsSofInterfaceVersion.h b/src/include/sof/audio/dts/DtsSofInterfaceVersion.h
@@ -9,7 +9,7 @@
 #define DTS_SOF_INTERFACE_PRODUCT_NAME "DtsSofInterface"
 #define DTS_SOF_INTERFACE_PRODUCT_VERSION_MAJOR 1
 #define DTS_SOF_INTERFACE_PRODUCT_VERSION_MINOR 0
-#define DTS_SOF_INTERFACE_PRODUCT_VERSION_PATCH 1
+#define DTS_SOF_INTERFACE_PRODUCT_VERSION_PATCH 7
 #define DTS_SOF_INTERFACE_PRODUCT_VERSION_BUILD 0
 #define DTS_SOF_INTERFACE_PRODUCT_VERSION_EXTRA "Dev"
 
