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

rework a couple of sample type converters, to actually work

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1883 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-09-22 00:26:18 +00:00
parent 78a9ad336b
commit 668340099c
2 changed files with 16 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -82,12 +82,7 @@ void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, int16_t *b) {
int16_t s; int16_t s;
float v = *(a++); float v = *(a++);
if (v > 1) v = CLAMP(v, -1, 1);
v = 1;
if (v < -1)
v = -1;
s = (int16_t) (v * 0x7FFF); s = (int16_t) (v * 0x7FFF);
*(b++) = INT16_TO(s); *(b++) = INT16_TO(s);
} }
@ -104,8 +99,6 @@ void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b) {
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
#if SWAP_WORDS == 1
for (; n > 0; n--) { for (; n > 0; n--) {
int16_t s = *(a++); int16_t s = *(a++);
float k = ((float) INT16_FROM(s))/0x7FFF; float k = ((float) INT16_FROM(s))/0x7FFF;
@ -113,31 +106,19 @@ void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b) {
*j = UINT32_SWAP(*j); *j = UINT32_SWAP(*j);
*(b++) = k; *(b++) = k;
} }
#endif
} }
void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b) { void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b) {
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
#if SWAP_WORDS == 1
for (; n > 0; n--) { for (; n > 0; n--) {
int16_t s; int16_t s;
float v = *(a++); float v = *(a++);
uint32_t *j = (uint32_t*) &v; uint32_t *j = (uint32_t*) &v;
*j = UINT32_SWAP(*j); *j = UINT32_SWAP(*j);
v = CLAMP(v, -1, 1);
if (v > 1)
v = 1;
if (v < -1)
v = -1;
s = (int16_t) (v * 0x7FFF); s = (int16_t) (v * 0x7FFF);
*(b++) = INT16_TO(s); *(b++) = INT16_TO(s);
} }
#endif
} }

38
src/pulsecore/sconv.c
View file

@ -43,7 +43,7 @@
/* u8 */ /* u8 */
static void u8_to_float32ne(unsigned n, const uint8_t *a, float *b) { static void u8_to_float32ne(unsigned n, const uint8_t *a, float *b) {
static const double add = -128.0/127.0, factor = 1.0/127.0; static const double add = -1, factor = 1.0/128.0;
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
@ -52,7 +52,7 @@ static void u8_to_float32ne(unsigned n, const uint8_t *a, float *b) {
} }
static void u8_from_float32ne(unsigned n, const float *a, uint8_t *b) { static void u8_from_float32ne(unsigned n, const float *a, uint8_t *b) {
static const double add = 128.0, factor = 127.0; static const double add = 128, factor = 127.0;
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
@ -61,7 +61,7 @@ static void u8_from_float32ne(unsigned n, const float *a, uint8_t *b) {
} }
static void u8_to_s16ne(unsigned n, const uint8_t *a, int16_t *b) { static void u8_to_s16ne(unsigned n, const uint8_t *a, int16_t *b) {
static const int16_t add = -128, factor = 0x100; static const int16_t add = -0x80, factor = 0x100;
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
@ -75,8 +75,8 @@ static void u8_from_s16ne(unsigned n, const int16_t *a, uint8_t *b) {
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
for (; n > 0; n--, a ++, a++) for (; n > 0; n--, a++, b++)
*b = (uint8_t) (*a / 0x100 + 0x80); *b = (uint8_t) (*a / 0x100 + 0x80);
} }
@ -121,7 +121,7 @@ static void ulaw_to_float32ne(unsigned n, const uint8_t *a, float *b) {
pa_assert(b); pa_assert(b);
for (; n > 0; n--) for (; n > 0; n--)
*(b++) = st_ulaw2linear16(*(a++)) * 1.0F / 0x7FFF; *(b++) = (float) st_ulaw2linear16(*(a++)) / 0x8000;
} }
static void ulaw_from_float32ne(unsigned n, const float *a, uint8_t *b) { static void ulaw_from_float32ne(unsigned n, const float *a, uint8_t *b) {
@ -130,14 +130,9 @@ static void ulaw_from_float32ne(unsigned n, const float *a, uint8_t *b) {
for (; n > 0; n--) { for (; n > 0; n--) {
float v = *(a++); float v = *(a++);
v = CLAMP(v, -1, 1);
if (v > 1) v *= 0x1FFF;
v = 1; *(b++) = st_14linear2ulaw((int16_t) v);
if (v < -1)
v = -1;
*(b++) = st_14linear2ulaw((int16_t) (v * 0x1FFF));
} }
} }
@ -164,7 +159,7 @@ static void alaw_to_float32ne(unsigned n, const uint8_t *a, float *b) {
pa_assert(b); pa_assert(b);
for (; n > 0; n--, a++, b++) for (; n > 0; n--, a++, b++)
*b = st_alaw2linear16(*a) * 1.0F / 0x7FFF; *b = (float) st_alaw2linear16(*a) / 0x8000;
} }
static void alaw_from_float32ne(unsigned n, const float *a, uint8_t *b) { static void alaw_from_float32ne(unsigned n, const float *a, uint8_t *b) {
@ -173,14 +168,9 @@ static void alaw_from_float32ne(unsigned n, const float *a, uint8_t *b) {
for (; n > 0; n--, a++, b++) { for (; n > 0; n--, a++, b++) {
float v = *a; float v = *a;
v = CLAMP(v, -1, 1);
if (v > 1) v *= 0xFFF;
v = 1; *b = st_13linear2alaw((int16_t) v);
if (v < -1)
v = -1;
*b = st_13linear2alaw((int16_t) (v * 0xFFF));
} }
} }
@ -196,7 +186,7 @@ static void alaw_from_s16ne(unsigned n, const int16_t *a, uint8_t *b) {
pa_assert(a); pa_assert(a);
pa_assert(b); pa_assert(b);
for (; n > 0; n--) for (; n > 0; n--, a++, b++)
*b = st_13linear2alaw(*a >> 3); *b = st_13linear2alaw(*a >> 3);
} }