mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

* implement volume adjusting and mixing for S16RE

Browse source 
* some optimizations


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1025 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-06-17 23:37:07 +00:00
parent e26bd47282
commit 5e1127a234
1 changed files with 83 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/polypcore/sample-util.c
View file

@ -33,6 +33,7 @@
#include <polypcore/log.h> #include <polypcore/log.h>
#include "sample-util.h" #include "sample-util.h"
#include "endianmacros.h"
pa_memblock *pa_silence_memblock_new(const pa_sample_spec *spec, size_t length, pa_memblock_stat*s) { pa_memblock *pa_silence_memblock_new(const pa_sample_spec *spec, size_t length, pa_memblock_stat*s) {
assert(spec); assert(spec);
@ -138,6 +139,54 @@ size_t pa_mix(
channel = 0; channel = 0;
} }
} }
case PA_SAMPLE_S16RE:{
size_t d;
unsigned channel = 0;
for (d = 0;; d += sizeof(int16_t)) {
int32_t sum = 0;
if (d >= length)
return d;
if (!mute && volume->values[channel] != PA_VOLUME_MUTED) {
unsigned i;
for (i = 0; i < nstreams; i++) {
int32_t v;
pa_volume_t cvolume = streams[i].volume.values[channel];
if (d >= streams[i].chunk.length)
return d;
if (cvolume == PA_VOLUME_MUTED)
v = 0;
else {
v = INT16_SWAP(*((int16_t*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d)));
if (cvolume != PA_VOLUME_NORM)
v = (int32_t) (v * pa_sw_volume_to_linear(cvolume));
}
sum += v;
}
if (volume->values[channel] != PA_VOLUME_NORM)
sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel]));
if (sum < -0x8000) sum = -0x8000;
if (sum > 0x7FFF) sum = 0x7FFF;
}
*((int16_t*) data) = INT16_SWAP(sum);
data = (uint8_t*) data + sizeof(int16_t);
if (++channel >= spec->channels)
channel = 0;
}
}
case PA_SAMPLE_U8: { case PA_SAMPLE_U8: {
size_t d; size_t d;
@ -232,6 +281,7 @@ size_t pa_mix(
} }
default: default:
pa_log_error(__FILE__": ERROR: Unable to mix audio data of format %s.", pa_sample_format_to_string(spec->format));
abort(); abort();
} }
} }
@ -253,12 +303,16 @@ void pa_volume_memchunk(pa_memchunk*c, const pa_sample_spec *spec, const pa_cvol
case PA_SAMPLE_S16NE: { case PA_SAMPLE_S16NE: {
int16_t *d; int16_t *d;
size_t n; size_t n;
unsigned channel = 0; unsigned channel;
double linear[PA_CHANNELS_MAX];
for (channel = 0; channel < spec->channels; channel++)
linear[channel] = pa_sw_volume_to_linear(volume->values[channel]);
for (d = (int16_t*) ((uint8_t*) c->memblock->data+c->index), n = c->length/sizeof(int16_t); n > 0; d++, n--) { for (channel = 0, d = (int16_t*) ((uint8_t*) c->memblock->data+c->index), n = c->length/sizeof(int16_t); n > 0; d++, n--) {
int32_t t = (int32_t)(*d); int32_t t = (int32_t)(*d);
t = (int32_t) (t * pa_sw_volume_to_linear(volume->values[channel])); t = (int32_t) (t * linear[channel]);
if (t < -0x8000) t = -0x8000; if (t < -0x8000) t = -0x8000;
if (t > 0x7FFF) t = 0x7FFF; if (t > 0x7FFF) t = 0x7FFF;
@ -270,6 +324,32 @@ void pa_volume_memchunk(pa_memchunk*c, const pa_sample_spec *spec, const pa_cvol
} }
break; break;
} }
case PA_SAMPLE_S16RE: {
int16_t *d;
size_t n;
unsigned channel;
double linear[PA_CHANNELS_MAX];
for (channel = 0; channel < spec->channels; channel++)
linear[channel] = pa_sw_volume_to_linear(volume->values[channel]);
for (channel = 0, d = (int16_t*) ((uint8_t*) c->memblock->data+c->index), n = c->length/sizeof(int16_t); n > 0; d++, n--) {
int32_t t = (int32_t)(INT16_SWAP(*d));
t = (int32_t) (t * linear[channel]);
if (t < -0x8000) t = -0x8000;
if (t > 0x7FFF) t = 0x7FFF;
*d = INT16_SWAP((int16_t) t);
if (++channel >= spec->channels)
channel = 0;
}
break;
}
case PA_SAMPLE_U8: { case PA_SAMPLE_U8: {
uint8_t *d; uint8_t *d;