[src/trunk]: src/sys/dev/pad No longer use AUDIO_INTERNAL_BITS but rely on pa...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a615b738fdca
branches:  trunk
changeset: 374449:a615b738fdca
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Apr 23 08:21:11 2023 +0000

description:
No longer use AUDIO_INTERNAL_BITS but rely on passed audio format.

diffstat:

 sys/dev/pad/pad.c |  36 ++++++++++++++++++++++++++----------
 1 files changed, 26 insertions(+), 10 deletions(-)

diffs (67 lines):

diff -r 5c9e629ee33c -r a615b738fdca sys/dev/pad/pad.c
--- a/sys/dev/pad/pad.c Sun Apr 23 08:06:05 2023 +0000
+++ b/sys/dev/pad/pad.c Sun Apr 23 08:21:11 2023 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pad.c,v 1.80 2023/04/10 15:04:49 mlelstv Exp $ */
+/* $NetBSD: pad.c,v 1.81 2023/04/23 08:21:11 mlelstv Exp $ */
 
 /*-
  * Copyright (c) 2007 Jared D. McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.80 2023/04/10 15:04:49 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pad.c,v 1.81 2023/04/23 08:21:11 mlelstv Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -744,24 +744,40 @@ static void
 pad_swvol_codec(audio_filter_arg_t *arg)
 {
        struct pad_softc *sc = arg->context;
-       const aint_t *src;
+       const uint8_t *src;
        uint8_t *dst;
        u_int sample_count;
        u_int i;
+       u_int bits;
 
        src = arg->src;
        dst = arg->dst;
        sample_count = arg->count * arg->srcfmt->channels;
+       bits = arg->srcfmt->precision;
+
        for (i = 0; i < sample_count; i++) {
-               aint2_t v = (aint2_t)(*src++);
+               int32_t v;
+
+               switch (howmany(bits, NBBY)) {
+               case 2: /* AUDIO_INTERNAL_BITS == 16 */
+                       v = *(const int16_t *)src;
+                       src += sizeof(int16_t);
+                       break;
+               case 4: /* AUDIO_INTERNAL_BITS == 32 */
+                       v = *(const int32_t *)src;
+                       src += sizeof(int32_t);
+                       break;
+               default:
+                       v = 0;
+                       break;
+               }
+
                v = v * sc->sc_swvol / 255;
 
-               CTASSERT(PADPREC <= AUDIO_INTERNAL_BITS * 2);
-#if PADPREC > AUDIO_INTERNAL_BITS
-               v = v << (PADPREC - AUDIO_INTERNAL_BITS);
-#elif PADPREC < AUDIO_INTERNAL_BITS
-               v = v >> (AUDIO_INTERNAL_BITS - PADPREC);
-#endif
+               if (PADPREC > bits)
+                       v = v << (PADPREC - bits);
+               else if (PADPREC < bits)
+                       v = v >> (bits - PADPREC);
 
                /* AUDIO_ENCODING_SLINEAR_LE */
 #if PADPREC > 0