Audio: PCM Converter: Add support for 8-bit S8 format

This patch adds to PCM converter the support to convert
between S8 and S32_LE formats.

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

Author: singalsu

app/boards/intel_adsp/Kconfig.defconfig

@@ -29,6 +29,9 @@ config FORMAT_MU_LAW
 config FORMAT_U8
 	default y
 
+config FORMAT_S8
+	default y
+
 config PCM_CONVERTER_FORMAT_A_LAW
 	default y
 
@@ -59,5 +62,8 @@ config PCM_CONVERTER_FORMAT_S24_C32_AND_S24_C24
 config PCM_CONVERTER_FORMAT_U8
 	default y
 
+config PCM_CONVERTER_FORMAT_S8
+	default y
+
 config PIPELINE_2_0
 	default y

src/audio/Kconfig

@@ -168,6 +168,11 @@ config FORMAT_U8
 	help
 	  Support unsigned 8 bit processing data format
 
+config FORMAT_S8
+	bool "Support S8"
+	help
+	  Support signed 8 bit processing data format
+
 config FORMAT_A_LAW
 	bool "Support A-law"
 	help
@@ -224,6 +229,11 @@ config PCM_CONVERTER_FORMAT_U8
 	help
 	  Support 8 bit processing data format without sign
 
+config PCM_CONVERTER_FORMAT_S8
+	bool "Support S8"
+	help
+	  Support signed 8 bit processing data format
+
 config PCM_CONVERTER_FORMAT_A_LAW
 	bool "Support A-law"
 	select MATH_A_LAW_CODEC

src/audio/pcm_converter/pcm_converter_generic.c

@@ -95,6 +95,66 @@ static int pcm_convert_s32_to_u8(const struct audio_stream *source,
 }
 #endif /* CONFIG_PCM_CONVERTER_FORMAT_U8 && CONFIG_PCM_CONVERTER_FORMAT_S32LE */
 
+#if CONFIG_PCM_CONVERTER_FORMAT_S8 && CONFIG_PCM_CONVERTER_FORMAT_S32LE
+static int pcm_convert_s8_to_s32(const struct audio_stream *source,
+				 uint32_t ioffset, struct audio_stream *sink,
+				 uint32_t ooffset, uint32_t samples, uint32_t chmap)
+{
+	int8_t *src = audio_stream_get_rptr(source);
+	int32_t *dst = audio_stream_get_wptr(sink);
+	uint32_t processed;
+	uint32_t nmax, i, n;
+
+	src += ioffset;
+	dst += ooffset;
+	for (processed = 0; processed < samples; processed += n) {
+		src = audio_stream_wrap(source, src);
+		dst = audio_stream_wrap(sink, dst);
+		n = samples - processed;
+		nmax = audio_stream_bytes_without_wrap(source, src) >> BYTES_TO_U8_SAMPLES;
+		n = MIN(n, nmax);
+		nmax = audio_stream_bytes_without_wrap(sink, dst) >> BYTES_TO_S32_SAMPLES;
+		n = MIN(n, nmax);
+		for (i = 0; i < n; i++) {
+			*dst = *src << 24;
+			src++;
+			dst++;
+		}
+	}
+
+	return samples;
+}
+
+static int pcm_convert_s32_to_s8(const struct audio_stream *source,
+				 uint32_t ioffset, struct audio_stream *sink,
+				 uint32_t ooffset, uint32_t samples, uint32_t chmap)
+{
+	int32_t *src = audio_stream_get_rptr(source);
+	int8_t *dst = audio_stream_get_wptr(sink);
+	uint32_t processed;
+	uint32_t nmax, i, n;
+
+	src += ioffset;
+	dst += ooffset;
+	for (processed = 0; processed < samples; processed += n) {
+		src = audio_stream_wrap(source, src);
+		dst = audio_stream_wrap(sink, dst);
+		n = samples - processed;
+		nmax = audio_stream_bytes_without_wrap(source, src) >> BYTES_TO_S32_SAMPLES;
+		n = MIN(n, nmax);
+		nmax = audio_stream_bytes_without_wrap(sink, dst) >> BYTES_TO_U8_SAMPLES;
+		n = MIN(n, nmax);
+		for (i = 0; i < n; i++) {
+			*dst = sat_int8(Q_SHIFT_RND(*src, 24, 0));
+			src++;
+			dst++;
+		}
+	}
+
+	return samples;
+}
+#endif /* CONFIG_PCM_CONVERTER_FORMAT_S8 && CONFIG_PCM_CONVERTER_FORMAT_S32LE */
+
 #if CONFIG_PCM_CONVERTER_FORMAT_A_LAW && CONFIG_PCM_CONVERTER_FORMAT_S32LE
 static int pcm_convert_alaw_to_s32(const struct audio_stream *source,
 				   uint32_t ioffset, struct audio_stream *sink,
@@ -677,6 +737,13 @@ const struct pcm_func_map pcm_func_map[] = {
 	{ SOF_IPC_FRAME_U8, SOF_IPC_FRAME_S32_LE, pcm_convert_u8_to_s32 },
 	{ SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_U8, pcm_convert_s32_to_u8 },
 #endif /* CONFIG_PCM_CONVERTER_FORMAT_U8 && CONFIG_PCM_CONVERTER_FORMAT_S32LE */
+#if CONFIG_PCM_CONVERTER_FORMAT_S8
+	{ SOF_IPC_FRAME_S8, SOF_IPC_FRAME_S8, just_copy },
+#endif /* CONFIG_PCM_CONVERTER_FORMAT_S8 */
+#if CONFIG_PCM_CONVERTER_FORMAT_S8 && CONFIG_PCM_CONVERTER_FORMAT_S32LE
+	{ SOF_IPC_FRAME_S8, SOF_IPC_FRAME_S32_LE, pcm_convert_s8_to_s32 },
+	{ SOF_IPC_FRAME_S32_LE, SOF_IPC_FRAME_S8, pcm_convert_s32_to_s8 },
+#endif /* CONFIG_PCM_CONVERTER_FORMAT_S8 && CONFIG_PCM_CONVERTER_FORMAT_S32LE */
 #if CONFIG_PCM_CONVERTER_FORMAT_A_LAW
 	{ SOF_IPC_FRAME_A_LAW, SOF_IPC_FRAME_A_LAW, just_copy },
 #endif /* CONFIG_PCM_CONVERTER_FORMAT_A_LAW */

src/include/module/ipc/stream.h

@@ -25,6 +25,7 @@ enum sof_ipc_frame {
 	SOF_IPC_FRAME_S16_4LE,		/* 16-bit in 32-bit container */
 	SOF_IPC_FRAME_A_LAW,
 	SOF_IPC_FRAME_MU_LAW,
+	SOF_IPC_FRAME_S8,
 	SOF_IPC_FRAME_INVALID,		/* keep last */
 };
 

src/include/sof/audio/audio_stream.h

@@ -1036,6 +1036,12 @@ static inline int audio_stream_fmt_conversion(enum ipc4_bit_depth depth,
 			*valid_fmt = SOF_IPC_FRAME_S24_3LE;
 			ret = 0;
 #endif
+		} else if (depth == 8 && valid == 8) {
+#ifdef CONFIG_FORMAT_S8
+			*frame_fmt = SOF_IPC_FRAME_S8;
+			*valid_fmt = SOF_IPC_FRAME_S8;
+			ret = 0;
+#endif /* CONFIG_FORMAT_S8 */
 		} else {
 			/* IPC4_DEPTH_16BIT (16) <---> SOF_IPC_FRAME_S16_LE (0)
 			 * IPC4_DEPTH_24BIT (24) <---> SOF_IPC_FRAME_S24_4LE (1)