sample-util: move volume code to separate file

Move the volume code into a separate file with the reference C implementations.
Add a function to retrieve the volume function and one to install a new one.

diff --git a/src/Makefile.am b/src/Makefile.am
index 17011cd..fc5d39f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -825,6 +825,7 @@ libpulsecore_@PA_MAJORMINORMICRO@_la_SOURCES = \
                pulsecore/resampler.c pulsecore/resampler.h \
                pulsecore/rtpoll.c pulsecore/rtpoll.h \
                pulsecore/sample-util.c pulsecore/sample-util.h \
+               pulsecore/svolume_c.c \
                pulsecore/sconv-s16be.c pulsecore/sconv-s16be.h \
                pulsecore/sconv-s16le.c pulsecore/sconv-s16le.h \
                pulsecore/sconv.c pulsecore/sconv.h \

diff --git a/src/pulsecore/sample-util.c b/src/pulsecore/sample-util.c
index f8a4c70..0bbd519 100644 (file)
--- a/src/pulsecore/sample-util.c
+++ b/src/pulsecore/sample-util.c
@@ -687,316 +687,6 @@ size_t pa_mix(
     return length;
 }
 
-typedef struct pa_volume_funcs {
-  void (*u8) (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*alaw) (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*ulaw) (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s16ne) (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s16re) (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*float32ne) (float *samples, float *volumes, unsigned channels, unsigned length);
-  void (*float32re) (float *samples, float *volumes, unsigned channels, unsigned length);
-  void (*s32ne) (int32_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s32re) (int32_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s24ne) (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s24re) (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s24_32ne) (uint32_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-  void (*s24_32re) (uint32_t *samples, int32_t *volumes, unsigned channels, unsigned length);
-} pa_volume_funcs;
-
-static void
-pa_volume_u8_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  for (channel = 0; length; length--) {
-    int32_t t, hi, lo;
-
-    hi = volumes[channel] >> 16;
-    lo = volumes[channel] & 0xFFFF;
-
-    t = (int32_t) *samples - 0x80;
-    t = ((t * lo) >> 16) + (t * hi);
-    t = PA_CLAMP_UNLIKELY(t, -0x80, 0x7F);
-    *samples++ = (uint8_t) (t + 0x80);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_alaw_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  for (channel = 0; length; length--) {
-    int32_t t, hi, lo;
-
-    hi = volumes[channel] >> 16;
-    lo = volumes[channel] & 0xFFFF;
-
-    t = (int32_t) st_alaw2linear16(*samples);
-    t = ((t * lo) >> 16) + (t * hi);
-    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-    *samples++ = (uint8_t) st_13linear2alaw((int16_t) t >> 3);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_ulaw_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  for (channel = 0; length; length--) {
-    int32_t t, hi, lo;
-
-    hi = volumes[channel] >> 16;
-    lo = volumes[channel] & 0xFFFF;
-
-    t = (int32_t) st_ulaw2linear16(*samples);
-    t = ((t * lo) >> 16) + (t * hi);
-    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-    *samples++ = (uint8_t) st_14linear2ulaw((int16_t) t >> 2);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s16ne_c (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (int16_t);
-
-  for (channel = 0; length; length--) {
-    int32_t t, hi, lo;
-
-    /* Multiplying the 32bit volume factor with the 16bit
-     * sample might result in an 48bit value. We want to
-     * do without 64 bit integers and hence do the
-     * multiplication independantly for the HI and LO part
-     * of the volume. */
-
-    hi = volumes[channel] >> 16;
-    lo = volumes[channel] & 0xFFFF;
-
-    t = (int32_t)(*samples);
-    t = ((t * lo) >> 16) + (t * hi);
-    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-    *samples++ = (int16_t) t;
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s16re_c (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (int16_t);
-
-  for (channel = 0; length; length--) {
-    int32_t t, hi, lo;
-
-    hi = volumes[channel] >> 16;
-    lo = volumes[channel] & 0xFFFF;
-
-    t = (int32_t) PA_INT16_SWAP(*samples);
-    t = ((t * lo) >> 16) + (t * hi);
-    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
-    *samples++ = PA_INT16_SWAP((int16_t) t);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_float32ne_c (float *samples, float *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (float);
-
-  for (channel = 0; length; length--) {
-    *samples++ *= volumes[channel];
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_float32re_c (float *samples, float *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (float);
-
-  for (channel = 0; length; length--) {
-    float t;
-
-    t = PA_FLOAT32_SWAP(*samples);
-    t *= volumes[channel];
-    *samples++ = PA_FLOAT32_SWAP(t);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s32ne_c (int32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (int32_t);
-
-  for (channel = 0; length; length--) {
-    int64_t t;
-
-    t = (int64_t)(*samples);
-    t = (t * volumes[channel]) >> 16;
-    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-    *samples++ = (int32_t) t;
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s32re_c (int32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (int32_t);
-
-  for (channel = 0; length; length--) {
-    int64_t t;
-
-    t = (int64_t) PA_INT32_SWAP(*samples);
-    t = (t * volumes[channel]) >> 16;
-    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-    *samples++ = PA_INT32_SWAP((int32_t) t);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s24ne_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-  uint8_t *e;
-
-  e = samples + length;
-
-  for (channel = 0; samples < e; samples += 3) {
-    int64_t t;
-
-    t = (int64_t)((int32_t) (PA_READ24NE(samples) << 8));
-    t = (t * volumes[channel]) >> 16;
-    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-    PA_WRITE24NE(samples, ((uint32_t) (int32_t) t) >> 8);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s24re_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-  uint8_t *e;
-
-  e = samples + length;
-
-  for (channel = 0; samples < e; samples += 3) {
-    int64_t t;
-
-    t = (int64_t)((int32_t) (PA_READ24RE(samples) << 8));
-    t = (t * volumes[channel]) >> 16;
-    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-    PA_WRITE24RE(samples, ((uint32_t) (int32_t) t) >> 8);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s24_32ne_c (uint32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (uint32_t);
-
-  for (channel = 0; length; length--) {
-    int64_t t;
-
-    t = (int64_t) ((int32_t) (*samples << 8));
-    t = (t * volumes[channel]) >> 16;
-    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-    *samples++ = ((uint32_t) ((int32_t) t)) >> 8;
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-static void
-pa_volume_s24_32re_c (uint32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
-{
-  unsigned channel;
-
-  length /= sizeof (uint32_t);
-
-  for (channel = 0; length; length--) {
-    int64_t t;
-
-    t = (int64_t) ((int32_t) (PA_UINT32_SWAP(*samples) << 8));
-    t = (t * volumes[channel]) >> 16;
-    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
-    *samples++ = PA_UINT32_SWAP(((uint32_t) ((int32_t) t)) >> 8);
-
-    if (PA_UNLIKELY(++channel >= channels))
-      channel = 0;
-  }
-}
-
-typedef void (*pa_do_volume_func_t) (void *samples, void *volumes, unsigned channels, unsigned length);
-
-typedef struct pa_sample_func_t {
-  pa_do_volume_func_t    do_volume;
-} pa_sample_func_t;
-
-static pa_do_volume_func_t do_volume_table[] =
-{
-  [PA_SAMPLE_U8]        = (pa_do_volume_func_t) pa_volume_u8_c,
-  [PA_SAMPLE_ALAW]      = (pa_do_volume_func_t) pa_volume_alaw_c,
-  [PA_SAMPLE_ULAW]      = (pa_do_volume_func_t) pa_volume_ulaw_c,
-  [PA_SAMPLE_S16NE]     = (pa_do_volume_func_t) pa_volume_s16ne_c,
-  [PA_SAMPLE_S16RE]     = (pa_do_volume_func_t) pa_volume_s16re_c,
-  [PA_SAMPLE_FLOAT32NE] = (pa_do_volume_func_t) pa_volume_float32ne_c,
-  [PA_SAMPLE_FLOAT32RE] = (pa_do_volume_func_t) pa_volume_float32re_c,
-  [PA_SAMPLE_S32NE]     = (pa_do_volume_func_t) pa_volume_s32ne_c,
-  [PA_SAMPLE_S32RE]     = (pa_do_volume_func_t) pa_volume_s32re_c,
-  [PA_SAMPLE_S24NE]     = (pa_do_volume_func_t) pa_volume_s24ne_c,
-  [PA_SAMPLE_S24RE]     = (pa_do_volume_func_t) pa_volume_s24re_c,
-  [PA_SAMPLE_S24_32NE]  = (pa_do_volume_func_t) pa_volume_s24_32ne_c,
-  [PA_SAMPLE_S24_32RE]  = (pa_do_volume_func_t) pa_volume_s24_32re_c
-};
-
 typedef union {
   float f;
   uint32_t i;
@@ -1027,6 +717,7 @@ void pa_volume_memchunk(
 
     void *ptr;
     volume_val linear[PA_CHANNELS_MAX];
+    pa_do_volume_func_t do_volume;
 
     pa_assert(c);
     pa_assert(spec);
@@ -1051,8 +742,11 @@ void pa_volume_memchunk(
 
     ptr = (uint8_t*) pa_memblock_acquire(c->memblock) + c->index;
 
+    do_volume = pa_get_volume_func (spec->format);
+    pa_assert(do_volume);
+    
     calc_volume_table[spec->format] ((void *)linear, volume);
-    do_volume_table[spec->format] (ptr, (void *)linear, spec->channels, c->length);
+    do_volume (ptr, (void *)linear, spec->channels, c->length);
 
     pa_memblock_release(c->memblock);
 }

diff --git a/src/pulsecore/sample-util.h b/src/pulsecore/sample-util.h
index 6a306c1..278b88b 100644 (file)
--- a/src/pulsecore/sample-util.h
+++ b/src/pulsecore/sample-util.h
@@ -86,6 +86,12 @@ void pa_memchunk_dump_to_file(pa_memchunk *c, const char *fn);
 
 void pa_memchunk_sine(pa_memchunk *c, pa_mempool *pool, unsigned rate, unsigned freq);
 
+typedef void (*pa_do_volume_func_t) (void *samples, void *volumes, unsigned channels, unsigned length);
+
+pa_do_volume_func_t pa_get_volume_func(pa_sample_format_t f);
+void pa_set_volume_func(pa_sample_format_t f, pa_do_volume_func_t func);
+
+
 #define PA_CHANNEL_POSITION_MASK_LEFT                                   \
     (PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_FRONT_LEFT)           \
      | PA_CHANNEL_POSITION_MASK(PA_CHANNEL_POSITION_REAR_LEFT)          \

diff --git a/src/pulsecore/svolume_c.c b/src/pulsecore/svolume_c.c
new file mode 100644 (file)
index 0000000..2148a57
--- /dev/null
+++ b/src/pulsecore/svolume_c.c
@@ -0,0 +1,335 @@
+/***
+  This file is part of PulseAudio.
+
+  Copyright 2004-2006 Lennart Poettering
+  Copyright 2006 Pierre Ossman <ossman@cendio.se> for Cendio AB
+
+  PulseAudio is free software; you can redistribute it and/or modify
+  it under the terms of the GNU Lesser General Public License as published
+  by the Free Software Foundation; either version 2.1 of the License,
+  or (at your option) any later version.
+
+  PulseAudio is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public License
+  along with PulseAudio; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+  USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+
+#include <pulsecore/macro.h>
+#include <pulsecore/g711.h>
+#include <pulsecore/core-util.h>
+
+#include "sample-util.h"
+#include "endianmacros.h"
+
+static void
+pa_volume_u8_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  for (channel = 0; length; length--) {
+    int32_t t, hi, lo;
+
+    hi = volumes[channel] >> 16;
+    lo = volumes[channel] & 0xFFFF;
+
+    t = (int32_t) *samples - 0x80;
+    t = ((t * lo) >> 16) + (t * hi);
+    t = PA_CLAMP_UNLIKELY(t, -0x80, 0x7F);
+    *samples++ = (uint8_t) (t + 0x80);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_alaw_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  for (channel = 0; length; length--) {
+    int32_t t, hi, lo;
+
+    hi = volumes[channel] >> 16;
+    lo = volumes[channel] & 0xFFFF;
+
+    t = (int32_t) st_alaw2linear16(*samples);
+    t = ((t * lo) >> 16) + (t * hi);
+    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
+    *samples++ = (uint8_t) st_13linear2alaw((int16_t) t >> 3);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_ulaw_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  for (channel = 0; length; length--) {
+    int32_t t, hi, lo;
+
+    hi = volumes[channel] >> 16;
+    lo = volumes[channel] & 0xFFFF;
+
+    t = (int32_t) st_ulaw2linear16(*samples);
+    t = ((t * lo) >> 16) + (t * hi);
+    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
+    *samples++ = (uint8_t) st_14linear2ulaw((int16_t) t >> 2);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s16ne_c (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (int16_t);
+
+  for (channel = 0; length; length--) {
+    int32_t t, hi, lo;
+
+    /* Multiplying the 32bit volume factor with the 16bit
+     * sample might result in an 48bit value. We want to
+     * do without 64 bit integers and hence do the
+     * multiplication independantly for the HI and LO part
+     * of the volume. */
+
+    hi = volumes[channel] >> 16;
+    lo = volumes[channel] & 0xFFFF;
+
+    t = (int32_t)(*samples);
+    t = ((t * lo) >> 16) + (t * hi);
+    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
+    *samples++ = (int16_t) t;
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s16re_c (int16_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (int16_t);
+
+  for (channel = 0; length; length--) {
+    int32_t t, hi, lo;
+
+    hi = volumes[channel] >> 16;
+    lo = volumes[channel] & 0xFFFF;
+
+    t = (int32_t) PA_INT16_SWAP(*samples);
+    t = ((t * lo) >> 16) + (t * hi);
+    t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
+    *samples++ = PA_INT16_SWAP((int16_t) t);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_float32ne_c (float *samples, float *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (float);
+
+  for (channel = 0; length; length--) {
+    *samples++ *= volumes[channel];
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_float32re_c (float *samples, float *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (float);
+
+  for (channel = 0; length; length--) {
+    float t;
+
+    t = PA_FLOAT32_SWAP(*samples);
+    t *= volumes[channel];
+    *samples++ = PA_FLOAT32_SWAP(t);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s32ne_c (int32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (int32_t);
+
+  for (channel = 0; length; length--) {
+    int64_t t;
+
+    t = (int64_t)(*samples);
+    t = (t * volumes[channel]) >> 16;
+    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
+    *samples++ = (int32_t) t;
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s32re_c (int32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (int32_t);
+
+  for (channel = 0; length; length--) {
+    int64_t t;
+
+    t = (int64_t) PA_INT32_SWAP(*samples);
+    t = (t * volumes[channel]) >> 16;
+    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
+    *samples++ = PA_INT32_SWAP((int32_t) t);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s24ne_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+  uint8_t *e;
+
+  e = samples + length;
+
+  for (channel = 0; samples < e; samples += 3) {
+    int64_t t;
+
+    t = (int64_t)((int32_t) (PA_READ24NE(samples) << 8));
+    t = (t * volumes[channel]) >> 16;
+    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
+    PA_WRITE24NE(samples, ((uint32_t) (int32_t) t) >> 8);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s24re_c (uint8_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+  uint8_t *e;
+
+  e = samples + length;
+
+  for (channel = 0; samples < e; samples += 3) {
+    int64_t t;
+
+    t = (int64_t)((int32_t) (PA_READ24RE(samples) << 8));
+    t = (t * volumes[channel]) >> 16;
+    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
+    PA_WRITE24RE(samples, ((uint32_t) (int32_t) t) >> 8);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s24_32ne_c (uint32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (uint32_t);
+
+  for (channel = 0; length; length--) {
+    int64_t t;
+
+    t = (int64_t) ((int32_t) (*samples << 8));
+    t = (t * volumes[channel]) >> 16;
+    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
+    *samples++ = ((uint32_t) ((int32_t) t)) >> 8;
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static void
+pa_volume_s24_32re_c (uint32_t *samples, int32_t *volumes, unsigned channels, unsigned length)
+{
+  unsigned channel;
+
+  length /= sizeof (uint32_t);
+
+  for (channel = 0; length; length--) {
+    int64_t t;
+
+    t = (int64_t) ((int32_t) (PA_UINT32_SWAP(*samples) << 8));
+    t = (t * volumes[channel]) >> 16;
+    t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
+    *samples++ = PA_UINT32_SWAP(((uint32_t) ((int32_t) t)) >> 8);
+
+    if (PA_UNLIKELY(++channel >= channels))
+      channel = 0;
+  }
+}
+
+static pa_do_volume_func_t do_volume_table[] =
+{
+  [PA_SAMPLE_U8]        = (pa_do_volume_func_t) pa_volume_u8_c,
+  [PA_SAMPLE_ALAW]      = (pa_do_volume_func_t) pa_volume_alaw_c,
+  [PA_SAMPLE_ULAW]      = (pa_do_volume_func_t) pa_volume_ulaw_c,
+  [PA_SAMPLE_S16NE]     = (pa_do_volume_func_t) pa_volume_s16ne_c,
+  [PA_SAMPLE_S16RE]     = (pa_do_volume_func_t) pa_volume_s16re_c,
+  [PA_SAMPLE_FLOAT32NE] = (pa_do_volume_func_t) pa_volume_float32ne_c,
+  [PA_SAMPLE_FLOAT32RE] = (pa_do_volume_func_t) pa_volume_float32re_c,
+  [PA_SAMPLE_S32NE]     = (pa_do_volume_func_t) pa_volume_s32ne_c,
+  [PA_SAMPLE_S32RE]     = (pa_do_volume_func_t) pa_volume_s32re_c,
+  [PA_SAMPLE_S24NE]     = (pa_do_volume_func_t) pa_volume_s24ne_c,
+  [PA_SAMPLE_S24RE]     = (pa_do_volume_func_t) pa_volume_s24re_c,
+  [PA_SAMPLE_S24_32NE]  = (pa_do_volume_func_t) pa_volume_s24_32ne_c,
+  [PA_SAMPLE_S24_32RE]  = (pa_do_volume_func_t) pa_volume_s24_32re_c
+};
+
+pa_do_volume_func_t pa_get_volume_func(pa_sample_format_t f) {
+    pa_assert(f >= 0);
+    pa_assert(f < PA_SAMPLE_MAX);
+
+    return do_volume_table[f];
+}
+
+void pa_set_volume_func(pa_sample_format_t f, pa_do_volume_func_t func) {
+    pa_assert(f >= 0);
+    pa_assert(f < PA_SAMPLE_MAX);
+
+    do_volume_table[f] = func;
+}