mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-08 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge 'lennart' branch back into trunk.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-10-28 19:13:50 +00:00
parent 6687dd0131
commit a67c21f093
294 changed files with 79057 additions and 11614 deletions
Download patch file Download diff file Expand all files Collapse all files

65
src/pulsecore/sconv-s16le.c
View file

@ -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"
@ -38,11 +38,11 @@
#include "sconv-s16le.h"
#ifndef INT16_FROM
#define INT16_FROM INT16_FROM_LE
#define INT16_FROM PA_INT16_FROM_LE
#endif
#ifndef INT16_TO
#define INT16_TO INT16_TO_LE
#define INT16_TO PA_INT16_TO_LE
#endif
#ifndef SWAP_WORDS
@ -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
@ -86,20 +82,43 @@ void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, void *b) {
int16_t s;
float v = *(a++);
if (v > 1)
v = 1;
if (v < -1)
v = -1;
v = CLAMP(v, -1, 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);
for (; n > 0; n--) {
int16_t s = *(a++);
float k = ((float) INT16_FROM(s))/0x7FFF;
uint32_t *j = (uint32_t*) &k;
*j = PA_UINT32_SWAP(*j);
*(b++) = k;
}
}
void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
int16_t s;
float v = *(a++);
uint32_t *j = (uint32_t*) &v;
*j = PA_UINT32_SWAP(*j);
v = CLAMP(v, -1, 1);
s = (int16_t) (v * 0x7FFF);
*(b++) = INT16_TO(s);
}
}