Audio: Cadence: Add a PCM (WAV) decoder

This patch adds a PCM decoder that is compatible with Cadence
codec API. It allows to test tinycompress cplay playback
with wav format files.

Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>

Author: singalsu

app/compr/README.txt

@@ -16,7 +16,8 @@ cadence.conf      - Base Cadence codec module only (no individual codecs)
 mp3.conf          - MP3 decoder and encoder
 aac.conf          - AAC decoder
 vorbis.conf       - Vorbis decoder
-all_codecs.conf   - All supported codecs (MP3, AAC, Vorbis)
+pcm.conf          - PCM (WAV) decoder
+all_codecs.conf   - All supported codecs (MP3, AAC, Vorbis, PCM)
 
 Usage Examples
 --------------

app/compr/all_codecs.conf

@@ -1,4 +1,4 @@
-# All Cadence codecs (MP3, AAC, Vorbis)
+# All Cadence codecs (MP3, AAC, Vorbis) plus SOF PCM/WAV decoder
 CONFIG_CADENCE_CODEC=y
 CONFIG_CADENCE_CODEC_MP3_DEC=y
 CONFIG_CADENCE_CODEC_MP3_DEC_LIB="../cadence_libs/xa_mp3_dec.a"
@@ -8,4 +8,4 @@ CONFIG_CADENCE_CODEC_AAC_DEC=y
 CONFIG_CADENCE_CODEC_AAC_DEC_LIB="../cadence_libs/xa_aac_dec.a"
 CONFIG_CADENCE_CODEC_VORBIS_DEC=y
 CONFIG_CADENCE_CODEC_VORBIS_DEC_LIB="../cadence_libs/xa_vorbis_dec.a"
-
+CONFIG_SOF_COMPRESS_CODEC_PCM_DEC=y

app/compr/pcm.conf

@@ -0,0 +1,3 @@
+# PCM (wav) decoder
+CONFIG_CADENCE_CODEC=y
+CONFIG_SOF_COMPRESS_CODEC_PCM_DEC=y

src/audio/base_fw.c

@@ -100,6 +100,10 @@ static void get_codec_info(struct sof_tlv **tuple)
 	codec_info.items[codec_info.count++] =
 		SET_CODEC_INFO_ITEM(SND_AUDIOCODEC_VORBIS, SOF_IPC_STREAM_PLAYBACK);
 #endif
+#ifdef CONFIG_SOF_COMPRESS_CODEC_PCM_DEC
+	codec_info.items[codec_info.count++] =
+		SET_CODEC_INFO_ITEM(SND_AUDIOCODEC_PCM, SOF_IPC_STREAM_PLAYBACK);
+#endif
 
 	if (!codec_info.count)
 		return;

src/audio/module_adapter/CMakeLists.txt

@@ -33,6 +33,9 @@ endif()
 		zephyr_library_import(xa_mp3_enc ${CONFIG_CADENCE_CODEC_MP3_ENC_LIB})
 	endif()
 
+	zephyr_library_sources_ifdef(CONFIG_SOF_COMPRESS_CODEC_PCM_DEC
+		module/compress_other/xa_pcm_dec.c)
+
 	if (CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING)
 		if(CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING STREQUAL "m" AND DEFINED CONFIG_LLEXT)
 			add_subdirectory(module/dolby/llext
@@ -148,6 +151,10 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 
 	endif()
 
+	if(CONFIG_SOF_COMPRESS_CODEC_PCM_DEC)
+		add_subdirectory(module/compress_other)
+	endif()
+
 	if(CONFIG_COMP_DOLBY_DAX_AUDIO_PROCESSING)
 		target_include_directories(sof PRIVATE ${PROJECT_SOURCE_DIR}/third_party/include)
 		add_local_sources(sof module/dolby/dax.c)

src/audio/module_adapter/Kconfig

@@ -173,6 +173,14 @@ if CADENCE_CODEC
 		  This option is a string and takes the full name of the SRC library binary.
 	endif
 
+	config SOF_COMPRESS_CODEC_PCM_DEC
+		bool "SOF PCM (WAV) decoder"
+		help
+		  Select to enable the PCM (WAV) passthrough decoder. It plugs
+		  into the Cadence codec wrapper but is an open-source
+		  implementation; no Cadence binary is required. To use it,
+		  build tinycompress cplay with the --enable-pcm option.
+
 endif # Cadence
 
 	config COMP_DOLBY_DAX_AUDIO_PROCESSING

src/audio/module_adapter/module/cadence.c

@@ -74,6 +74,12 @@ struct cadence_api cadence_api_table[] = {
 		.api = xa_src_pp,
 	},
 #endif
+#ifdef CONFIG_SOF_COMPRESS_CODEC_PCM_DEC
+	{
+		.id = SOF_COMPRESS_CODEC_PCM_DEC_ID,
+		.api = xa_pcm_dec,
+	},
+#endif
 };
 
 static int cadence_codec_get_api_id(uint32_t compress_id, uint32_t direction)
@@ -89,6 +95,8 @@ static int cadence_codec_get_api_id(uint32_t compress_id, uint32_t direction)
 		return CADENCE_CODEC_AAC_DEC_ID;
 	case SND_AUDIOCODEC_VORBIS:
 		return CADENCE_CODEC_VORBIS_DEC_ID;
+	case SND_AUDIOCODEC_PCM:
+		return SOF_COMPRESS_CODEC_PCM_DEC_ID;
 	default:
 		return -EINVAL;
 	}
@@ -236,6 +244,22 @@ int cadence_codec_get_samples(struct processing_module *mod)
 		return 1152;
 	case CADENCE_CODEC_AAC_DEC_ID:
 		return 1024;
+	case SOF_COMPRESS_CODEC_PCM_DEC_ID: {
+		/*
+		 * xa_pcm_dec has no fixed frame size: it can produce up to the
+		 * full configured output buffer per call. Report the upper
+		 * bound (ceiling division) so the IPC3 free-space gate covers
+		 * what the codec may actually write even when out_buff_size is
+		 * not an exact multiple of frame_bytes.
+		 */
+		struct module_data *codec = &mod->priv;
+		uint32_t frame_bytes = mod->stream_params->sample_container_bytes *
+				       mod->stream_params->channels;
+
+		if (!frame_bytes)
+			return 0;
+		return (codec->mpd.out_buff_size + frame_bytes - 1) / frame_bytes;
+	}
 	default:
 		break;
 	}

src/audio/module_adapter/module/cadence_ipc3.c

@@ -273,8 +273,8 @@ cadence_codec_process(struct processing_module *mod,
 	codec->mpd.consumed = input_buffers[0].consumed;
 
 	/* copy the produced samples into the output buffer */
-	memcpy_s(output_buffers[0].data, codec->mpd.produced, codec->mpd.out_buff,
-		 codec->mpd.produced);
+	memcpy_s(output_buffers[0].data, codec->mpd.out_buff_size,
+		 codec->mpd.out_buff, codec->mpd.produced);
 	output_buffers[0].size = codec->mpd.produced;
 
 	comp_dbg(dev, "cadence_codec_process() done");

src/audio/module_adapter/module/cadence_ipc4.c

@@ -209,6 +209,9 @@ static int cadence_configure_codec_params(struct processing_module *mod)
 	case CADENCE_CODEC_VORBIS_DEC_ID:
 		/* No configuration needed for Vorbis */
 		return 0;
+	case SOF_COMPRESS_CODEC_PCM_DEC_ID:
+		/* No configuration needed for PCM decoder */
+		return 0;
 	default:
 		break;
 	}

src/audio/module_adapter/module/compress_other/CMakeLists.txt

@@ -0,0 +1,5 @@
+# SPDX-License-Identifier: BSD-3-Clause
+
+if(CONFIG_SOF_COMPRESS_CODEC_PCM_DEC)
+	add_local_sources(sof xa_pcm_dec.c)
+endif()