mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-26 07:00:07 -05:00
big resampler rework: support integer-only resampling, support speex resampler
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1712 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
4eb9bb0746
commit
ed4dc16b95
8 changed files with 723 additions and 442 deletions
|
|
@ -25,12 +25,12 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <assert.h>
|
||||
#include <inttypes.h>
|
||||
|
||||
#include <liboil/liboilfuncs.h>
|
||||
|
||||
#include <pulsecore/sconv.h>
|
||||
#include <pulsecore/macro.h>
|
||||
#include <pulsecore/log.h>
|
||||
|
||||
#include "endianmacros.h"
|
||||
|
|
@ -53,32 +53,28 @@
|
|||
#endif
|
||||
#endif
|
||||
|
||||
void pa_sconv_s16le_to_float32ne(unsigned n, const void *a, float *b) {
|
||||
const int16_t *ca = a;
|
||||
|
||||
assert(a);
|
||||
assert(b);
|
||||
void pa_sconv_s16le_to_float32ne(unsigned n, const int16_t *a, float *b) {
|
||||
pa_assert(a);
|
||||
pa_assert(b);
|
||||
|
||||
#if SWAP_WORDS == 1
|
||||
|
||||
for (; n > 0; n--) {
|
||||
int16_t s = *(ca++);
|
||||
int16_t s = *(a++);
|
||||
*(b++) = ((float) INT16_FROM(s))/0x7FFF;
|
||||
}
|
||||
|
||||
#else
|
||||
{
|
||||
static const double add = 0, factor = 1.0/0x7FFF;
|
||||
oil_scaleconv_f32_s16(b, ca, n, &add, &factor);
|
||||
oil_scaleconv_f32_s16(b, a, n, &add, &factor);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, void *b) {
|
||||
int16_t *cb = b;
|
||||
|
||||
assert(a);
|
||||
assert(b);
|
||||
void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, int16_t *b) {
|
||||
pa_assert(a);
|
||||
pa_assert(b);
|
||||
|
||||
#if SWAP_WORDS == 1
|
||||
|
||||
|
|
@ -93,13 +89,55 @@ void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, void *b) {
|
|||
v = -1;
|
||||
|
||||
s = (int16_t) (v * 0x7FFF);
|
||||
*(cb++) = INT16_TO(s);
|
||||
*(b++) = INT16_TO(s);
|
||||
}
|
||||
|
||||
#else
|
||||
{
|
||||
static const double add = 0, factor = 0x7FFF;
|
||||
oil_scaleconv_s16_f32(cb, a, n, &add, &factor);
|
||||
oil_scaleconv_s16_f32(b, a, n, &add, &factor);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b) {
|
||||
pa_assert(a);
|
||||
pa_assert(b);
|
||||
|
||||
#if SWAP_WORDS == 1
|
||||
|
||||
for (; n > 0; n--) {
|
||||
int16_t s = *(a++);
|
||||
float k = ((float) INT16_FROM(s))/0x7FFF;
|
||||
uint32_t *j = (uint32_t*) &k;
|
||||
*j = UINT32_SWAP(*j);
|
||||
*(b++) = k;
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
||||
void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b) {
|
||||
pa_assert(a);
|
||||
pa_assert(b);
|
||||
|
||||
#if SWAP_WORDS == 1
|
||||
|
||||
for (; n > 0; n--) {
|
||||
int16_t s;
|
||||
float v = *(a++);
|
||||
uint32_t *j = (uint32_t*) &v;
|
||||
*j = UINT32_SWAP(*j);
|
||||
|
||||
if (v > 1)
|
||||
v = 1;
|
||||
|
||||
if (v < -1)
|
||||
v = -1;
|
||||
|
||||
s = (int16_t) (v * 0x7FFF);
|
||||
*(b++) = INT16_TO(s);
|
||||
}
|
||||
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue