Skip to contentSkip to conversation

dmix: Add support for S24_3BE format.

PATCH In review Vincent Vinel 3 participants 5 messages Feb 15, 2014 – Feb 17, 2014

lore
Share & tools
lore
#0 lore raw

cover dmix: Add support for S24_3BE format.

Hello,

This patch adds swapped versions for generic_(re)mix_areas_24() functions. I am unsure if the same code could handle S24_BE properly, so this format is left out and only S24_3BE is supported.

Thanks !

Vincent Vinel (1):
dmix: Add support for S24_3BE format.

 include/pcm.h              |  4 +++
 src/pcm/pcm_direct.c       |  3 +-
 src/pcm/pcm_dmix.c         |  2 ++
 src/pcm/pcm_dmix_generic.c | 77 +++++++++++++++++++++++++++++++++++++++++++---
 4 files changed, 80 insertions(+), 6 deletions(-)
Signature · 1 line
1.8.5.5
#1 lore raw

PATCH 1/1 dmix: Add support for S24_3BE format.

Add swapped versions of generic_mix_areas_24() and generic_remix_areas_24().

include/pcm.h +4 -0
index 95b8aed..9be595c 100644
@@ -222,6 +222,8 @@ typedef enum _snd_pcm_format {
 	SND_PCM_FORMAT_S24 = SND_PCM_FORMAT_S24_LE,
 	/** Unsigned 24 bit CPU endian */
 	SND_PCM_FORMAT_U24 = SND_PCM_FORMAT_U24_LE,
+	/** Signed 24 bit CPU endian in 3bytes format */
+	SND_PCM_FORMAT_S24_3 = SND_PCM_FORMAT_S24_3LE,
 	/** Signed 32 bit CPU endian */
 	SND_PCM_FORMAT_S32 = SND_PCM_FORMAT_S32_LE,
 	/** Unsigned 32 bit CPU endian */
@@ -241,6 +243,8 @@ typedef enum _snd_pcm_format {
 	SND_PCM_FORMAT_S24 = SND_PCM_FORMAT_S24_BE,
 	/** Unsigned 24 bit CPU endian */
 	SND_PCM_FORMAT_U24 = SND_PCM_FORMAT_U24_BE,
+	/** Signed 24 bit CPU endian in 3bytes format */
+	SND_PCM_FORMAT_S24_3 = SND_PCM_FORMAT_S24_3BE,
 	/** Signed 32 bit CPU endian */
 	SND_PCM_FORMAT_S32 = SND_PCM_FORMAT_S32_BE,
 	/** Unsigned 32 bit CPU endian */
src/pcm/pcm_direct.c +2 -1
index 5416cf7..1a98d8f 100644
@@ -909,7 +909,8 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
 			SND_PCM_FORMAT_S16,
 			SND_PCM_FORMAT_S16 ^ SND_PCM_FORMAT_S16_LE ^ SND_PCM_FORMAT_S16_BE,
 			SND_PCM_FORMAT_S24_LE,
-			SND_PCM_FORMAT_S24_3LE,
+			SND_PCM_FORMAT_S24_3,
+			SND_PCM_FORMAT_S24_3 ^ SND_PCM_FORMAT_S24_3LE ^ SND_PCM_FORMAT_S24_3BE,
 			SND_PCM_FORMAT_U8,
 		};
 		snd_pcm_format_t format;
src/pcm/pcm_dmix.c +2 -0
index 4aa6d4e..46ca289 100644
@@ -179,6 +179,7 @@ static void mix_areas(snd_pcm_direct_t *dmix,
 		do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24;
 		break;
 	case SND_PCM_FORMAT_S24_3LE:
+	case SND_PCM_FORMAT_S24_3BE:
 		sample_size = 3;
 		do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24;
 		break;
@@ -247,6 +248,7 @@ static void remix_areas(snd_pcm_direct_t *dmix,
 		do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24;
 		break;
 	case SND_PCM_FORMAT_S24_3LE:
+	case SND_PCM_FORMAT_S24_3BE:
 		sample_size = 3;
 		do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24;
 		break;
src/pcm/pcm_dmix_generic.c +72 -5

116 lines not on this page · raw message

Signature · 1 line
1.8.5.5
#2 lore raw
Quoted 2 lines · Vincent Vinel

Add swapped versions of generic_mix_areas_24() and generic_remix_areas_24().

What for?

Regards,
Clemens

#3 lore raw
Quoted 5 lines · Clemens Ladisch
Quoted 2 lines · Vincent Vinel

Add swapped versions of generic_mix_areas_24() and generic_remix_areas_24().

What for?

To use dmix with soundcards only supporting S24_3BE format, i.e. those using snd-usb-caiaq driver.

Signature · 1 line
Narthorn
#4 lore raw
In reply to Vincent Vinel

At Sat, 15 Feb 2014 17:54:31 +0100,

Quoted 20 lines · Vincent Vinel

Add swapped versions of generic_mix_areas_24() and generic_remix_areas_24().

include/pcm.h +2 -0
index 95b8aed..9be595c 100644
@@ -222,6 +222,8 @@ typedef enum _snd_pcm_format {
 	SND_PCM_FORMAT_S24 = SND_PCM_FORMAT_S24_LE,
 	/** Unsigned 24 bit CPU endian */
 	SND_PCM_FORMAT_U24 = SND_PCM_FORMAT_U24_LE,
+	/** Signed 24 bit CPU endian in 3bytes format */
+	SND_PCM_FORMAT_S24_3 = SND_PCM_FORMAT_S24_3LE,
 	/** Signed 32 bit CPU endian */
 	SND_PCM_FORMAT_S32 = SND_PCM_FORMAT_S32_LE,
 	/** Unsigned 32 bit CPU endian */

include/pcm.h typedef enum _snd_pcm_format { · line 250

Quoted 8 lines
include/pcm.h +2 -0
@@ -241,6 +243,8 @@ typedef enum _snd_pcm_format {
 	SND_PCM_FORMAT_S24 = SND_PCM_FORMAT_S24_BE,
 	/** Unsigned 24 bit CPU endian */
 	SND_PCM_FORMAT_U24 = SND_PCM_FORMAT_U24_BE,
+	/** Signed 24 bit CPU endian in 3bytes format */
+	SND_PCM_FORMAT_S24_3 = SND_PCM_FORMAT_S24_3BE,
 	/** Signed 32 bit CPU endian */
 	SND_PCM_FORMAT_S32 = SND_PCM_FORMAT_S32_BE,
 	/** Unsigned 32 bit CPU endian */

Please split this as a separate patch.

Quoted 148 lines
src/pcm/pcm_direct.c +2 -1
index 5416cf7..1a98d8f 100644
@@ -909,7 +909,8 @@ int snd_pcm_direct_initialize_slave(snd_pcm_direct_t *dmix, snd_pcm_t *spcm, str
 			SND_PCM_FORMAT_S16,
 			SND_PCM_FORMAT_S16 ^ SND_PCM_FORMAT_S16_LE ^ SND_PCM_FORMAT_S16_BE,
 			SND_PCM_FORMAT_S24_LE,
-			SND_PCM_FORMAT_S24_3LE,
+			SND_PCM_FORMAT_S24_3,
+			SND_PCM_FORMAT_S24_3 ^ SND_PCM_FORMAT_S24_3LE ^ SND_PCM_FORMAT_S24_3BE,
 			SND_PCM_FORMAT_U8,
 		};
 		snd_pcm_format_t format;
src/pcm/pcm_dmix.c +2 -0
index 4aa6d4e..46ca289 100644
@@ -179,6 +179,7 @@ static void mix_areas(snd_pcm_direct_t *dmix,
 		do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24;
 		break;
 	case SND_PCM_FORMAT_S24_3LE:
+	case SND_PCM_FORMAT_S24_3BE:
 		sample_size = 3;
 		do_mix_areas = (mix_areas_t *)dmix->u.dmix.mix_areas_24;
 		break;
@@ -247,6 +248,7 @@ static void remix_areas(snd_pcm_direct_t *dmix,
 		do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24;
 		break;
 	case SND_PCM_FORMAT_S24_3LE:
+	case SND_PCM_FORMAT_S24_3BE:
 		sample_size = 3;
 		do_remix_areas = (mix_areas_t *)dmix->u.dmix.remix_areas_24;
 		break;
src/pcm/pcm_dmix_generic.c +70 -3
index 9e9d3c3..91abd88 100644
@@ -123,6 +123,7 @@ static void mix_select_callbacks(snd_pcm_direct_t *dmix)
 	((1ULL << SND_PCM_FORMAT_S16_LE) | (1ULL << SND_PCM_FORMAT_S32_LE) |\
 	 (1ULL << SND_PCM_FORMAT_S16_BE) | (1ULL << SND_PCM_FORMAT_S32_BE) |\
 	 (1ULL << SND_PCM_FORMAT_S24_LE) | (1ULL << SND_PCM_FORMAT_S24_3LE) | \
+	 (1ULL << SND_PCM_FORMAT_S24_3BE) |\
 	 (1ULL << SND_PCM_FORMAT_U8))
 
 #include <byteswap.h>
@@ -387,8 +388,7 @@ static void generic_remix_areas_32_swap(unsigned int size,
 	}
 }
 
-/* always little endian */
-static void generic_mix_areas_24(unsigned int size,
+static void generic_mix_areas_24_native(unsigned int size,
 				 volatile unsigned char *dst,
 				 unsigned char *src,
 				 volatile signed int *sum,
@@ -421,7 +421,40 @@ static void generic_mix_areas_24(unsigned int size,
 	}
 }
 
-static void generic_remix_areas_24(unsigned int size,
+static void generic_mix_areas_24_swap(unsigned int size,
+				 volatile unsigned char *dst,
+				 unsigned char *src,
+				 volatile signed int *sum,
+				 size_t dst_step,
+				 size_t src_step,
+				 size_t sum_step)
+{
+	register signed int sample;
+
+	for (;;) {
+		sample = src[2] | (src[1] << 8) | (((signed char *)src)[0] << 16);
+		if (!(dst[0] | dst[1] | dst[2])) {
+			*sum = sample;
+		} else {
+			sample += *sum;
+			*sum = sample;
+			if (sample > 0x7fffff)
+				sample = 0x7fffff;
+			else if (sample < -0x800000)
+				sample = -0x800000;
+		}
+		dst[2] = sample;
+		dst[1] = sample >> 8;
+		dst[0] = sample >> 16;
+		if (!--size)
+			return;
+		dst += dst_step;
+		src += src_step;
+		sum = (signed int *) ((char *)sum + sum_step);
+	}
+}
+
+static void generic_remix_areas_24_native(unsigned int size,
 				   volatile unsigned char *dst,
 				   unsigned char *src,
 				   volatile signed int *sum,
@@ -454,6 +487,38 @@ static void generic_remix_areas_24(unsigned int size,
 	}
 }
 
+static void generic_remix_areas_24_swap(unsigned int size,
+				   volatile unsigned char *dst,
+				   unsigned char *src,
+				   volatile signed int *sum,
+				   size_t dst_step,
+				   size_t src_step,
+				   size_t sum_step)
+{
+	register signed int sample;
+
+	for (;;) {
+		sample = src[2] | (src[1] << 8) | (((signed char *)src)[0] << 16);
+		if (!(dst[0] | dst[1] | dst[2])) {
+			sample = -sample;
+			*sum = sample;
+		} else {
+			*sum = sample = *sum - sample;
+			if (sample > 0x7fffff)
+				sample = 0x7fffff;
+			else if (sample < -0x800000)
+				sample = -0x800000;
+		}
+		dst[2] = sample;
+		dst[1] = sample >> 8;
+		dst[0] = sample >> 16;
+		if (!--size)
+			return;
+		dst += dst_step;
+		src += src_step;
+		sum = (signed int *) ((char *)sum + sum_step);
+	}
+}
 static void generic_mix_areas_u8(unsigned int size,
 				 volatile unsigned char *dst,
 				 unsigned char *src,
@@ -518,17 +583,19 @@ static void generic_mix_select_callbacks(snd_pcm_direct_t *dmix)
 	if (snd_pcm_format_cpu_endian(dmix->shmptr->s.format)) {
 		dmix->u.dmix.mix_areas_16 = generic_mix_areas_16_native;
 		dmix->u.dmix.mix_areas_32 = generic_mix_areas_32_native;
+		dmix->u.dmix.mix_areas_24 = generic_mix_areas_24_native;
 		dmix->u.dmix.remix_areas_16 = generic_remix_areas_16_native;
 		dmix->u.dmix.remix_areas_32 = generic_remix_areas_32_native;
+		dmix->u.dmix.remix_areas_24 = generic_remix_areas_24_native;
 	} else {
 		dmix->u.dmix.mix_areas_16 = generic_mix_areas_16_swap;
 		dmix->u.dmix.mix_areas_32 = generic_mix_areas_32_swap;

src/pcm/pcm_dmix_generic.c static void generic_mix_select_callbacks(snd_pcm_direct_t *dmix) · line 600

Quoted 10 lines
src/pcm/pcm_dmix_generic.c +2 -2
+		dmix->u.dmix.mix_areas_24 = generic_mix_areas_24_swap;
 		dmix->u.dmix.remix_areas_16 = generic_remix_areas_16_swap;
 		dmix->u.dmix.remix_areas_32 = generic_remix_areas_32_swap;
+		dmix->u.dmix.remix_areas_24 = generic_remix_areas_24_swap;
 	}
-	dmix->u.dmix.mix_areas_24 = generic_mix_areas_24;
 	dmix->u.dmix.mix_areas_u8 = generic_mix_areas_u8;
-	dmix->u.dmix.remix_areas_24 = generic_remix_areas_24;
 	dmix->u.dmix.remix_areas_u8 = generic_remix_areas_u8;
 }

S24_BE can be added very similarly. Please either merge into the patch or create another patch.

thanks,

Takashi