[PA_SAMPLE_S24_32BE] = (pa_calc_stream_volumes_func_t) calc_linear_integer_stream_volumes
};
-static void pa_mix_s16ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+/* special case: mix 2 s16ne streams, 1 channel each */
+static void pa_mix2_ch1_s16ne(pa_mix_info streams[], int16_t *data, unsigned length) {
+ const int16_t *ptr0 = streams[0].ptr;
+ const int16_t *ptr1 = streams[1].ptr;
+
+ const int32_t cv0 = streams[0].linear[0].i;
+ const int32_t cv1 = streams[1].linear[0].i;
+
+ length /= sizeof(int16_t);
+
+ for (; length > 0; length--) {
+ int32_t sum;
+
+ sum = pa_mult_s16_volume(*ptr0++, cv0);
+ sum += pa_mult_s16_volume(*ptr1++, cv1);
+
+ sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+ *data++ = sum;
+ }
+}
+
+/* special case: mix 2 s16ne streams, 2 channels each */
+static void pa_mix2_ch2_s16ne(pa_mix_info streams[], int16_t *data, unsigned length) {
+ const int16_t *ptr0 = streams[0].ptr;
+ const int16_t *ptr1 = streams[1].ptr;
+
+ length /= sizeof(int16_t) * 2;
+
+ for (; length > 0; length--) {
+ int32_t sum;
+
+ sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[0].i);
+ sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[0].i);
+
+ sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+ *data++ = sum;
+
+ sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[1].i);
+ sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[1].i);
+
+ sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+ *data++ = sum;
+ }
+}
+
+/* special case: mix 2 s16ne streams */
+static void pa_mix2_s16ne(pa_mix_info streams[], unsigned channels, int16_t *data, unsigned length) {
+ const int16_t *ptr0 = streams[0].ptr;
+ const int16_t *ptr1 = streams[1].ptr;
unsigned channel = 0;
- while (data < end) {
- int32_t sum = 0;
+ length /= sizeof(int16_t);
+
+ for (; length > 0; length--) {
+ int32_t sum;
+
+ sum = pa_mult_s16_volume(*ptr0++, streams[0].linear[channel].i);
+ sum += pa_mult_s16_volume(*ptr1++, streams[1].linear[channel].i);
+
+ sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
+ *data++ = sum;
+
+ if (PA_UNLIKELY(++channel >= channels))
+ channel = 0;
+ }
+}
+
+/* special case: mix s16ne streams, 2 channels each */
+static void pa_mix_ch2_s16ne(pa_mix_info streams[], unsigned nstreams, int16_t *data, unsigned length) {
+
+ length /= sizeof(int16_t) * 2;
+
+ for (; length > 0; length--) {
+ int32_t sum0 = 0, sum1 = 0;
unsigned i;
for (i = 0; i < nstreams; i++) {
pa_mix_info *m = streams + i;
- int32_t v, lo, hi, cv = m->linear[channel].i;
+ int32_t cv0 = m->linear[0].i;
+ int32_t cv1 = m->linear[1].i;
- if (PA_LIKELY(cv > 0)) {
+ sum0 += pa_mult_s16_volume(*((int16_t*) m->ptr), cv0);
+ m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
+
+ sum1 += pa_mult_s16_volume(*((int16_t*) m->ptr), cv1);
+ m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
+ }
+
+ *data++ = PA_CLAMP_UNLIKELY(sum0, -0x8000, 0x7FFF);
+ *data++ = PA_CLAMP_UNLIKELY(sum1, -0x8000, 0x7FFF);
+ }
+}
- /* Multiplying the 32bit volume factor with the
- * 16bit sample might result in an 48bit value. We
- * want to do without 64 bit integers and hence do
- * the multiplication independently for the HI and
- * LO part of the volume. */
+static void pa_mix_generic_s16ne(pa_mix_info streams[], unsigned nstreams, unsigned channels, int16_t *data, unsigned length) {
+ unsigned channel = 0;
- hi = cv >> 16;
- lo = cv & 0xFFFF;
+ length /= sizeof(int16_t);
- v = *((int16_t*) m->ptr);
- v = ((v * lo) >> 16) + (v * hi);
- sum += v;
- }
+ for (; length > 0; length--) {
+ int32_t sum = 0;
+ unsigned i;
+
+ for (i = 0; i < nstreams; i++) {
+ pa_mix_info *m = streams + i;
+ int32_t cv = m->linear[channel].i;
+
+ if (PA_LIKELY(cv > 0))
+ sum += pa_mult_s16_volume(*((int16_t*) m->ptr), cv);
m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
}
sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
- *((int16_t*) data) = (int16_t) sum;
-
- data = (uint8_t*) data + sizeof(int16_t);
+ *data++ = sum;
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s16re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s16ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, int16_t *data, unsigned length) {
+ if (nstreams == 2 && channels == 1)
+ pa_mix2_ch1_s16ne(streams, data, length);
+ else if (nstreams == 2 && channels == 2)
+ pa_mix2_ch2_s16ne(streams, data, length);
+ else if (nstreams == 2)
+ pa_mix2_s16ne(streams, channels, data, length);
+ else if (channels == 2)
+ pa_mix_ch2_s16ne(streams, nstreams, data, length);
+ else
+ pa_mix_generic_s16ne(streams, nstreams, channels, data, length);
+}
+
+static void pa_mix_s16re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, int16_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(int16_t);
+
+ for (; length > 0; length--, data++) {
int32_t sum = 0;
unsigned i;
for (i = 0; i < nstreams; i++) {
pa_mix_info *m = streams + i;
- int32_t v, lo, hi, cv = m->linear[channel].i;
-
- if (PA_LIKELY(cv > 0)) {
-
- hi = cv >> 16;
- lo = cv & 0xFFFF;
+ int32_t cv = m->linear[channel].i;
- v = PA_INT16_SWAP(*((int16_t*) m->ptr));
- v = ((v * lo) >> 16) + (v * hi);
- sum += v;
- }
+ if (PA_LIKELY(cv > 0))
+ sum += pa_mult_s16_volume(PA_INT16_SWAP(*((int16_t*) m->ptr)), cv);
m->ptr = (uint8_t*) m->ptr + sizeof(int16_t);
}
sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
- *((int16_t*) data) = PA_INT16_SWAP((int16_t) sum);
-
- data = (uint8_t*) data + sizeof(int16_t);
+ *data = PA_INT16_SWAP((int16_t) sum);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s32ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s32ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, int32_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(int32_t);
+
+ for (; length > 0; length--, data++) {
int64_t sum = 0;
unsigned i;
int64_t v;
if (PA_LIKELY(cv > 0)) {
-
v = *((int32_t*) m->ptr);
v = (v * cv) >> 16;
sum += v;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
- *((int32_t*) data) = (int32_t) sum;
-
- data = (uint8_t*) data + sizeof(int32_t);
+ *data = (int32_t) sum;
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s32re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s32re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, int32_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(int32_t);
+
+ for (; length > 0; length--, data++) {
int64_t sum = 0;
unsigned i;
int64_t v;
if (PA_LIKELY(cv > 0)) {
-
v = PA_INT32_SWAP(*((int32_t*) m->ptr));
v = (v * cv) >> 16;
sum += v;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
- *((int32_t*) data) = PA_INT32_SWAP((int32_t) sum);
-
- data = (uint8_t*) data + sizeof(int32_t);
+ *data = PA_INT32_SWAP((int32_t) sum);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s24ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s24ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint8_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ for (; length > 0; length -= 3, data += 3) {
int64_t sum = 0;
unsigned i;
int64_t v;
if (PA_LIKELY(cv > 0)) {
-
v = (int32_t) (PA_READ24NE(m->ptr) << 8);
v = (v * cv) >> 16;
sum += v;
sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
PA_WRITE24NE(data, ((uint32_t) sum) >> 8);
- data = (uint8_t*) data + 3;
-
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s24re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s24re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint8_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ for (; length > 0; length -= 3, data += 3) {
int64_t sum = 0;
unsigned i;
int64_t v;
if (PA_LIKELY(cv > 0)) {
-
v = (int32_t) (PA_READ24RE(m->ptr) << 8);
v = (v * cv) >> 16;
sum += v;
sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
PA_WRITE24RE(data, ((uint32_t) sum) >> 8);
- data = (uint8_t*) data + 3;
-
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s24_32ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s24_32ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint32_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(uint32_t);
+
+ for (; length > 0; length--, data++) {
int64_t sum = 0;
unsigned i;
int64_t v;
if (PA_LIKELY(cv > 0)) {
-
v = (int32_t) (*((uint32_t*)m->ptr) << 8);
v = (v * cv) >> 16;
sum += v;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
- *((uint32_t*) data) = ((uint32_t) (int32_t) sum) >> 8;
-
- data = (uint8_t*) data + sizeof(uint32_t);
+ *data = ((uint32_t) (int32_t) sum) >> 8;
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_s24_32re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_s24_32re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint32_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(uint32_t);
+
+ for (; length > 0; length--, data++) {
int64_t sum = 0;
unsigned i;
int64_t v;
if (PA_LIKELY(cv > 0)) {
-
v = (int32_t) (PA_UINT32_SWAP(*((uint32_t*) m->ptr)) << 8);
v = (v * cv) >> 16;
sum += v;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x80000000LL, 0x7FFFFFFFLL);
- *((uint32_t*) data) = PA_INT32_SWAP(((uint32_t) (int32_t) sum) >> 8);
-
- data = (uint8_t*) data + sizeof(uint32_t);
+ *data = PA_INT32_SWAP(((uint32_t) (int32_t) sum) >> 8);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_u8_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_u8_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint8_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(uint8_t);
+
+ for (; length > 0; length--, data++) {
int32_t sum = 0;
unsigned i;
int32_t v, cv = m->linear[channel].i;
if (PA_LIKELY(cv > 0)) {
-
v = (int32_t) *((uint8_t*) m->ptr) - 0x80;
v = (v * cv) >> 16;
sum += v;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x80, 0x7F);
- *((uint8_t*) data) = (uint8_t) (sum + 0x80);
-
- data = (uint8_t*) data + 1;
+ *data = (uint8_t) (sum + 0x80);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_ulaw_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_ulaw_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint8_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(uint8_t);
+
+ for (; length > 0; length--, data++) {
int32_t sum = 0;
unsigned i;
for (i = 0; i < nstreams; i++) {
pa_mix_info *m = streams + i;
- int32_t v, hi, lo, cv = m->linear[channel].i;
-
- if (PA_LIKELY(cv > 0)) {
-
- hi = cv >> 16;
- lo = cv & 0xFFFF;
+ int32_t cv = m->linear[channel].i;
- v = (int32_t) st_ulaw2linear16(*((uint8_t*) m->ptr));
- v = ((v * lo) >> 16) + (v * hi);
- sum += v;
- }
+ if (PA_LIKELY(cv > 0))
+ sum += pa_mult_s16_volume(st_ulaw2linear16(*((uint8_t*) m->ptr)), cv);
m->ptr = (uint8_t*) m->ptr + 1;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
- *((uint8_t*) data) = (uint8_t) st_14linear2ulaw((int16_t) sum >> 2);
-
- data = (uint8_t*) data + 1;
+ *data = (uint8_t) st_14linear2ulaw((int16_t) sum >> 2);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_alaw_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_alaw_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, uint8_t *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(uint8_t);
+
+ for (; length > 0; length--, data++) {
int32_t sum = 0;
unsigned i;
for (i = 0; i < nstreams; i++) {
pa_mix_info *m = streams + i;
- int32_t v, hi, lo, cv = m->linear[channel].i;
-
- if (PA_LIKELY(cv > 0)) {
-
- hi = cv >> 16;
- lo = cv & 0xFFFF;
+ int32_t cv = m->linear[channel].i;
- v = (int32_t) st_alaw2linear16(*((uint8_t*) m->ptr));
- v = ((v * lo) >> 16) + (v * hi);
- sum += v;
- }
+ if (PA_LIKELY(cv > 0))
+ sum += pa_mult_s16_volume(st_alaw2linear16(*((uint8_t*) m->ptr)), cv);
m->ptr = (uint8_t*) m->ptr + 1;
}
sum = PA_CLAMP_UNLIKELY(sum, -0x8000, 0x7FFF);
- *((uint8_t*) data) = (uint8_t) st_13linear2alaw((int16_t) sum >> 3);
-
- data = (uint8_t*) data + 1;
+ *data = (uint8_t) st_13linear2alaw((int16_t) sum >> 3);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_float32ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_float32ne_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, float *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(float);
+
+ for (; length > 0; length--, data++) {
float sum = 0;
unsigned i;
float v, cv = m->linear[channel].f;
if (PA_LIKELY(cv > 0)) {
-
v = *((float*) m->ptr);
v *= cv;
sum += v;
m->ptr = (uint8_t*) m->ptr + sizeof(float);
}
- *((float*) data) = sum;
-
- data = (uint8_t*) data + sizeof(float);
+ *data = sum;
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
}
}
-static void pa_mix_float32re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, void *data, void *end) {
+static void pa_mix_float32re_c(pa_mix_info streams[], unsigned nstreams, unsigned channels, float *data, unsigned length) {
unsigned channel = 0;
- while (data < end) {
+ length /= sizeof(float);
+
+ for (; length > 0; length--, data++) {
float sum = 0;
unsigned i;
float v, cv = m->linear[channel].f;
if (PA_LIKELY(cv > 0)) {
-
v = PA_FLOAT32_SWAP(*(float*) m->ptr);
v *= cv;
sum += v;
m->ptr = (uint8_t*) m->ptr + sizeof(float);
}
- *((float*) data) = PA_FLOAT32_SWAP(sum);
-
- data = (uint8_t*) data + sizeof(float);
+ *data = PA_FLOAT32_SWAP(sum);
if (PA_UNLIKELY(++channel >= channels))
channel = 0;
size_t length,
const pa_sample_spec *spec,
const pa_cvolume *volume,
- pa_bool_t mute) {
+ bool mute) {
pa_cvolume full_volume;
unsigned k;
- void *end;
pa_assert(streams);
pa_assert(data);
length = streams[k].chunk.length;
}
- end = (uint8_t*) data + length;
-
calc_stream_volumes_table[spec->format](streams, nstreams, volume, spec);
- do_mix_table[spec->format](streams, nstreams, spec->channels, data, end);
+ do_mix_table[spec->format](streams, nstreams, spec->channels, data, length);
for (k = 0; k < nstreams; k++)
pa_memblock_release(streams[k].chunk.memblock);
}
pa_do_mix_func_t pa_get_mix_func(pa_sample_format_t f) {
- pa_assert(f >= 0);
- pa_assert(f < PA_SAMPLE_MAX);
+ pa_assert(pa_sample_format_valid(f));
return do_mix_table[f];
}
void pa_set_mix_func(pa_sample_format_t f, pa_do_mix_func_t func) {
- pa_assert(f >= 0);
- pa_assert(f < PA_SAMPLE_MAX);
+ pa_assert(pa_sample_format_valid(f));
do_mix_table[f] = func;
}