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

add support for 32bit integer samples

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@2037 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2007-11-09 02:45:07 +00:00
parent 3c17c7d442
commit 7e0f547f2f
12 changed files with 319 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/pulsecore/resampler.c
View file

@ -240,7 +240,9 @@ pa_resampler* pa_resampler_new(
if (r->map_required || a->format != b->format) {
if (a->format == PA_SAMPLE_FLOAT32NE || a->format == PA_SAMPLE_FLOAT32RE ||
if (a->format == PA_SAMPLE_S32NE || a->format == PA_SAMPLE_S32RE ||
a->format == PA_SAMPLE_FLOAT32NE || a->format == PA_SAMPLE_FLOAT32RE ||
b->format == PA_SAMPLE_S32NE || b->format == PA_SAMPLE_S32RE ||
b->format == PA_SAMPLE_FLOAT32NE || b->format == PA_SAMPLE_FLOAT32RE)
r->work_format = PA_SAMPLE_FLOAT32NE;
else

61
src/pulsecore/sample-util.c
View file

@ -100,6 +100,8 @@ void pa_silence_memory(void *p, size_t length, const pa_sample_spec *spec) {
break;
case PA_SAMPLE_S16LE:
case PA_SAMPLE_S16BE:
case PA_SAMPLE_S32LE:
case PA_SAMPLE_S32BE:
case PA_SAMPLE_FLOAT32:
case PA_SAMPLE_FLOAT32RE:
c = 0;
@ -380,10 +382,10 @@ void pa_volume_memchunk(
t = (int32_t)(*d);
t = (t * linear[channel]) / 0x10000;
t = CLAMP(t, -0x8000, 0x7FFF);
t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
*d = (int16_t) t;
if (++channel >= spec->channels)
if (PA_UNLIKELY(++channel >= spec->channels))
channel = 0;
}
break;
@ -403,10 +405,57 @@ void pa_volume_memchunk(
t = (int32_t)(PA_INT16_SWAP(*d));
t = (t * linear[channel]) / 0x10000;
t = CLAMP(t, -0x8000, 0x7FFF);
t = PA_CLAMP_UNLIKELY(t, -0x8000, 0x7FFF);
*d = PA_INT16_SWAP((int16_t) t);
if (++channel >= spec->channels)
if (PA_UNLIKELY(++channel >= spec->channels))
channel = 0;
}
break;
}
case PA_SAMPLE_S32NE: {
int32_t *d;
size_t n;
unsigned channel;
int32_t linear[PA_CHANNELS_MAX];
for (channel = 0; channel < spec->channels; channel++)
linear[channel] = (int32_t) (pa_sw_volume_to_linear(volume->values[channel]) * 0x10000);
for (channel = 0, d = (int32_t*) ((uint8_t*) ptr + c->index), n = c->length/sizeof(int32_t); n > 0; d++, n--) {
int64_t t;
t = (int64_t)(*d);
t = (t * linear[channel]) / 0x10000;
t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
*d = (int32_t) t;
if (PA_UNLIKELY(++channel >= spec->channels))
channel = 0;
}
break;
}
case PA_SAMPLE_S32RE: {
int32_t *d;
size_t n;
unsigned channel;
int32_t linear[PA_CHANNELS_MAX];
for (channel = 0; channel < spec->channels; channel++)
linear[channel] = (int32_t) (pa_sw_volume_to_linear(volume->values[channel]) * 0x10000);
for (channel = 0, d = (int32_t*) ((uint8_t*) ptr + c->index), n = c->length/sizeof(int32_t); n > 0; d++, n--) {
int64_t t;
t = (int64_t)(PA_INT32_SWAP(*d));
t = (t * linear[channel]) / 0x10000;
t = PA_CLAMP_UNLIKELY(t, -0x80000000LL, 0x7FFFFFFFLL);
*d = PA_INT32_SWAP((int32_t) t);
if (PA_UNLIKELY(++channel >= spec->channels))
channel = 0;
}
@ -427,10 +476,10 @@ void pa_volume_memchunk(
t = (int32_t) *d - 0x80;
t = (t * linear[channel]) / 0x10000;
t = CLAMP(t, -0x80, 0x7F);
t = PA_CLAMP_UNLIKELY(t, -0x80, 0x7F);
*d = (uint8_t) (t + 0x80);
if (++channel >= spec->channels)
if (PA_UNLIKELY(++channel >= spec->channels))
channel = 0;
}
break;

15
src/pulsecore/sconv-s16be.c
View file

@ -30,12 +30,27 @@
#define INT16_FROM PA_INT16_FROM_BE
#define INT16_TO PA_INT16_TO_BE
#define INT32_FROM PA_INT32_FROM_BE
#define INT32_TO PA_INT32_TO_BE
#define pa_sconv_s16le_to_float32ne pa_sconv_s16be_to_float32ne
#define pa_sconv_s16le_from_float32ne pa_sconv_s16be_from_float32ne
#define pa_sconv_s16le_to_float32re pa_sconv_s16be_to_float32re
#define pa_sconv_s16le_from_float32re pa_sconv_s16be_from_float32re
#define pa_sconv_s32le_to_float32ne pa_sconv_s32be_to_float32ne
#define pa_sconv_s32le_from_float32ne pa_sconv_s32be_from_float32ne
#define pa_sconv_s32le_to_float32re pa_sconv_s32be_to_float32re
#define pa_sconv_s32le_from_float32re pa_sconv_s32be_from_float32re
#define pa_sconv_s32le_to_s16ne pa_sconv_s32be_to_s16ne
#define pa_sconv_s32le_from_s16ne pa_sconv_s32be_from_s16ne
#define pa_sconv_s32le_to_s16re pa_sconv_s32be_to_s16re
#define pa_sconv_s32le_from_s16re pa_sconv_s32be_from_s16re
#ifdef WORDS_BIGENDIAN
#define SWAP_WORDS 0
#else

20
src/pulsecore/sconv-s16be.h
View file

@ -31,11 +31,31 @@ void pa_sconv_s16be_from_float32ne(unsigned n, const float *a, int16_t *b);
void pa_sconv_s16be_to_float32re(unsigned n, const int16_t *a, float *b);
void pa_sconv_s16be_from_float32re(unsigned n, const float *a, int16_t *b);
void pa_sconv_s32be_to_float32ne(unsigned n, const int32_t *a, float *b);
void pa_sconv_s32be_from_float32ne(unsigned n, const float *a, int32_t *b);
void pa_sconv_s32be_to_float32re(unsigned n, const int32_t *a, float *b);
void pa_sconv_s32be_from_float32re(unsigned n, const float *a, int32_t *b);
void pa_sconv_s32be_to_s16ne(unsigned n, const int32_t *a, int16_t *b);
void pa_sconv_s32be_from_s16ne(unsigned n, const int16_t *a, int32_t *b);
void pa_sconv_s32be_to_s16re(unsigned n, const int32_t *a, int16_t *b);
void pa_sconv_s32be_from_s16re(unsigned n, const int16_t *a, int32_t *b);
#ifdef WORDS_BIGENDIAN
#define pa_sconv_float32be_to_s16ne pa_sconv_s16be_from_float32ne
#define pa_sconv_float32be_from_s16ne pa_sconv_s16be_to_float32ne
#define pa_sconv_float32le_to_s16ne pa_sconv_s16be_from_float32re
#define pa_sconv_float32le_from_s16ne pa_sconv_s16be_to_float32re
#define pa_sconv_float32be_to_s32ne pa_sconv_s32be_from_float32ne
#define pa_sconv_float32be_from_s32ne pa_sconv_s32be_to_float32ne
#define pa_sconv_float32le_to_s32ne pa_sconv_s32be_from_float32re
#define pa_sconv_float32le_from_s32ne pa_sconv_s32be_to_float32re
#define pa_sconv_s16be_to_s32ne pa_sconv_s32be_from_s16ne
#define pa_sconv_s16be_from_s32ne pa_sconv_s32be_to_s16ne
#define pa_sconv_s16le_to_s32ne pa_sconv_s32be_from_s16re
#define pa_sconv_s16le_from_s32ne pa_sconv_s32be_to_s16re
#endif
#endif

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

@ -25,7 +25,10 @@
#include <config.h>
#endif
/* Despite the name of this file we implement S32 handling here, too. */
#include <inttypes.h>
#include <stdio.h>
#include <liboil/liboilfuncs.h>
@ -45,6 +48,14 @@
#define INT16_TO PA_INT16_TO_LE
#endif
#ifndef INT32_FROM
#define INT32_FROM PA_INT32_FROM_LE
#endif
#ifndef INT32_TO
#define INT32_TO PA_INT32_TO_LE
#endif
#ifndef SWAP_WORDS
#ifdef WORDS_BIGENDIAN
#define SWAP_WORDS 1
@ -72,6 +83,25 @@ void pa_sconv_s16le_to_float32ne(unsigned n, const int16_t *a, float *b) {
#endif
}
void pa_sconv_s32le_to_float32ne(unsigned n, const int32_t *a, float *b) {
pa_assert(a);
pa_assert(b);
#if SWAP_WORDS == 1
for (; n > 0; n--) {
int32_t s = *(a++);
*(b++) = (float) (((double) INT32_FROM(s))/0x7FFFFFFF);
}
#else
{
static const double add = 0, factor = 1.0/0x7FFFFFFF;
oil_scaleconv_f32_s32(b, a, n, &add, &factor);
}
#endif
}
void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, int16_t *b) {
pa_assert(a);
pa_assert(b);
@ -82,7 +112,7 @@ void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, int16_t *b) {
int16_t s;
float v = *(a++);
v = CLAMP(v, -1, 1);
v = PA_CLAMP_UNLIKELY(v, -1, 1);
s = (int16_t) (v * 0x7FFF);
*(b++) = INT16_TO(s);
}
@ -95,6 +125,29 @@ void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, int16_t *b) {
#endif
}
void pa_sconv_s32le_from_float32ne(unsigned n, const float *a, int32_t *b) {
pa_assert(a);
pa_assert(b);
#if SWAP_WORDS == 1
for (; n > 0; n--) {
int32_t s;
float v = *(a++);
v = PA_CLAMP_UNLIKELY(v, -1, 1);
s = (int32_t) ((double) v * (double) 0x7FFFFFFF);
*(b++) = INT32_TO(s);
}
#else
{
static const double add = 0, factor = 0x7FFFFFFF;
oil_scaleconv_s32_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);
@ -108,6 +161,19 @@ void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b) {
}
}
void pa_sconv_s32le_to_float32re(unsigned n, const int32_t *a, float *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
int32_t s = *(a++);
float k = (float) (((double) INT32_FROM(s))/0x7FFFFFFF);
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);
@ -117,8 +183,69 @@ void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b) {
float v = *(a++);
uint32_t *j = (uint32_t*) &v;
*j = PA_UINT32_SWAP(*j);
v = CLAMP(v, -1, 1);
v = PA_CLAMP_UNLIKELY(v, -1, 1);
s = (int16_t) (v * 0x7FFF);
*(b++) = INT16_TO(s);
}
}
void pa_sconv_s32le_from_float32re(unsigned n, const float *a, int32_t *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
int32_t s;
float v = *(a++);
uint32_t *j = (uint32_t*) &v;
*j = PA_UINT32_SWAP(*j);
v = PA_CLAMP_UNLIKELY(v, -1, 1);
s = (int32_t) ((double) v * 0x7FFFFFFF);
*(b++) = INT32_TO(s);
}
}
void pa_sconv_s32le_to_s16ne(unsigned n, const int32_t*a, int16_t *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
*b = (int16_t) (INT32_FROM(*a) >> 16);
a++;
b++;
}
}
void pa_sconv_s32le_to_s16re(unsigned n, const int32_t*a, int16_t *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
int16_t s = (int16_t) (INT32_FROM(*a) >> 16);
*b = PA_UINT32_SWAP(s);
a++;
b++;
}
}
void pa_sconv_s32le_from_s16ne(unsigned n, const int16_t *a, int32_t *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
*b = INT32_TO(((int32_t) *a) << 16);
a++;
b++;
}
}
void pa_sconv_s32le_from_s16re(unsigned n, const int16_t *a, int32_t *b) {
pa_assert(a);
pa_assert(b);
for (; n > 0; n--) {
int32_t s = ((int32_t) PA_UINT16_SWAP(*a)) << 16;
*b = INT32_TO(s);
a++;
b++;
}
}

20
src/pulsecore/sconv-s16le.h
View file

@ -31,11 +31,31 @@ void pa_sconv_s16le_from_float32ne(unsigned n, const float *a, int16_t *b);
void pa_sconv_s16le_to_float32re(unsigned n, const int16_t *a, float *b);
void pa_sconv_s16le_from_float32re(unsigned n, const float *a, int16_t *b);
void pa_sconv_s32le_to_float32ne(unsigned n, const int32_t *a, float *b);
void pa_sconv_s32le_from_float32ne(unsigned n, const float *a, int32_t *b);
void pa_sconv_s32le_to_float32re(unsigned n, const int32_t *a, float *b);
void pa_sconv_s32le_from_float32re(unsigned n, const float *a, int32_t *b);
void pa_sconv_s32le_to_s16ne(unsigned n, const int32_t *a, int16_t *b);
void pa_sconv_s32le_from_s16ne(unsigned n, const int16_t *a, int32_t *b);
void pa_sconv_s32le_to_s16re(unsigned n, const int32_t *a, int16_t *b);
void pa_sconv_s32le_from_s16re(unsigned n, const int16_t *a, int32_t *b);
#ifndef WORDS_BIGENDIAN
#define pa_sconv_float32be_to_s16ne pa_sconv_s16le_from_float32re
#define pa_sconv_float32be_from_s16ne pa_sconv_s16le_to_float32re
#define pa_sconv_float32le_to_s16ne pa_sconv_s16le_from_float32ne
#define pa_sconv_float32le_from_s16ne pa_sconv_s16le_to_float32ne
#define pa_sconv_float32be_to_s32ne pa_sconv_s32le_from_float32re
#define pa_sconv_float32be_from_s32ne pa_sconv_s32le_to_float32re
#define pa_sconv_float32le_to_s32ne pa_sconv_s32le_from_float32ne
#define pa_sconv_float32le_from_s32ne pa_sconv_s32le_to_float32ne
#define pa_sconv_s16be_to_s32ne pa_sconv_s32le_from_s16re
#define pa_sconv_s16be_from_s32ne pa_sconv_s32le_to_s16re
#define pa_sconv_s16le_to_s32ne pa_sconv_s32le_from_s16ne
#define pa_sconv_s16le_from_s32ne pa_sconv_s32le_to_s16ne
#endif
#endif

8
src/pulsecore/sconv.c
View file

@ -198,6 +198,8 @@ pa_convert_func_t pa_get_convert_to_float32ne_function(pa_sample_format_t f) {
[PA_SAMPLE_ULAW] = (pa_convert_func_t) ulaw_to_float32ne,
[PA_SAMPLE_S16LE] = (pa_convert_func_t) pa_sconv_s16le_to_float32ne,
[PA_SAMPLE_S16BE] = (pa_convert_func_t) pa_sconv_s16be_to_float32ne,
[PA_SAMPLE_S32LE] = (pa_convert_func_t) pa_sconv_s32le_to_float32ne,
[PA_SAMPLE_S32BE] = (pa_convert_func_t) pa_sconv_s32be_to_float32ne,
[PA_SAMPLE_FLOAT32NE] = (pa_convert_func_t) float32ne_to_float32ne,
[PA_SAMPLE_FLOAT32RE] = (pa_convert_func_t) float32re_to_float32ne,
};
@ -214,6 +216,8 @@ pa_convert_func_t pa_get_convert_from_float32ne_function(pa_sample_format_t f) {
[PA_SAMPLE_U8] = (pa_convert_func_t) u8_from_float32ne,
[PA_SAMPLE_S16LE] = (pa_convert_func_t) pa_sconv_s16le_from_float32ne,
[PA_SAMPLE_S16BE] = (pa_convert_func_t) pa_sconv_s16be_from_float32ne,
[PA_SAMPLE_S32LE] = (pa_convert_func_t) pa_sconv_s32le_from_float32ne,
[PA_SAMPLE_S32BE] = (pa_convert_func_t) pa_sconv_s32be_from_float32ne,
[PA_SAMPLE_FLOAT32NE] = (pa_convert_func_t) float32ne_to_float32ne,
[PA_SAMPLE_FLOAT32RE] = (pa_convert_func_t) float32re_to_float32ne,
[PA_SAMPLE_ALAW] = (pa_convert_func_t) alaw_from_float32ne,
@ -234,6 +238,8 @@ pa_convert_func_t pa_get_convert_to_s16ne_function(pa_sample_format_t f) {
[PA_SAMPLE_S16RE] = (pa_convert_func_t) s16re_to_s16ne,
[PA_SAMPLE_FLOAT32BE] = (pa_convert_func_t) pa_sconv_float32be_to_s16ne,
[PA_SAMPLE_FLOAT32LE] = (pa_convert_func_t) pa_sconv_float32le_to_s16ne,
[PA_SAMPLE_S32BE] = (pa_convert_func_t) pa_sconv_s32be_to_s16ne,
[PA_SAMPLE_S32LE] = (pa_convert_func_t) pa_sconv_s32le_to_s16ne,
[PA_SAMPLE_ALAW] = (pa_convert_func_t) alaw_to_s16ne,
[PA_SAMPLE_ULAW] = (pa_convert_func_t) ulaw_to_s16ne
};
@ -252,6 +258,8 @@ pa_convert_func_t pa_get_convert_from_s16ne_function(pa_sample_format_t f) {
[PA_SAMPLE_S16RE] = (pa_convert_func_t) s16re_to_s16ne,
[PA_SAMPLE_FLOAT32BE] = (pa_convert_func_t) pa_sconv_float32be_from_s16ne,
[PA_SAMPLE_FLOAT32LE] = (pa_convert_func_t) pa_sconv_float32le_from_s16ne,
[PA_SAMPLE_S32BE] = (pa_convert_func_t) pa_sconv_s32be_from_s16ne,
[PA_SAMPLE_S32LE] = (pa_convert_func_t) pa_sconv_s32le_from_s16ne,
[PA_SAMPLE_ALAW] = (pa_convert_func_t) alaw_from_s16ne,
[PA_SAMPLE_ULAW] = (pa_convert_func_t) ulaw_from_s16ne,
};