2009-08-20 18:23:42 +02:00
|
|
|
/***
|
|
|
|
|
This file is part of PulseAudio.
|
|
|
|
|
|
|
|
|
|
Copyright 2004-2006 Lennart Poettering
|
|
|
|
|
Copyright 2009 Wim Taymans <wim.taymans@collabora.co.uk.com>
|
|
|
|
|
|
|
|
|
|
PulseAudio is free software; you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU Lesser General Public License as published
|
|
|
|
|
by the Free Software Foundation; either version 2.1 of the License,
|
|
|
|
|
or (at your option) any later version.
|
|
|
|
|
|
|
|
|
|
PulseAudio is distributed in the hope that it will be useful, but
|
|
|
|
|
WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU Lesser General Public License
|
|
|
|
|
along with PulseAudio; if not, write to the Free Software
|
|
|
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
|
|
|
|
USA.
|
|
|
|
|
***/
|
|
|
|
|
|
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#include <string.h>
|
|
|
|
|
|
remap: Add special remapping case which just re-arranges channels
Input channels may just be copied to output channels, no mixing; this
avoids the generic (slow) matrix remapping code in cases where channels
are dropped or reordered.
This makes use of the remap struct state introduced earlier.
on Intel Core i7-870 @ 2.93 GHz (GCC 4.6, 64-bit):
Checking special remap (s16, stereo rearrange)
func: 126117 usec (avg: 1261.17, min = 1150, max = 2111, stddev = 117.332).
orig: 190509 usec (avg: 1905.09, min = 1807, max = 2402, stddev = 100.984).
Checking special remap (float, stereo rearrange)
func: 194329 usec (avg: 1943.29, min = 1876, max = 2127, stddev = 64.3486).
orig: 205263 usec (avg: 2052.63, min = 2005, max = 2452, stddev = 70.177).
Checking special remap (s16, 4-channel rearrange)
func: 278754 usec (avg: 2787.54, min = 2719, max = 3093, stddev = 78.22).
orig: 383885 usec (avg: 3838.85, min = 3634, max = 4121, stddev = 128.522).
Checking special remap (float, 4-channel rearrange)
func: 312429 usec (avg: 3124.29, min = 3017, max = 3498, stddev = 120.127).
orig: 388198 usec (avg: 3881.98, min = 3768, max = 4655, stddev = 138.441).
on ARM Cortex-A8 (TI OMAP3 DM3730 @ 1GHz) (Linaro GCC 4.6):
Checking special remap (s16, stereo rearrange)
func: 1204647 usec (avg: 12046.5, min = 10406, max = 25451, stddev = 2491.9).
orig: 1660311 usec (avg: 16603.1, min = 14740, max = 20416, stddev = 1708.07).
Checking special remap (float, stereo rearrange)
func: 1391392 usec (avg: 13913.9, min = 12207, max = 28260, stddev = 2238.12).
orig: 9246707 usec (avg: 92467.1, min = 87525, max = 125611, stddev = 5494.64).
Checking special remap (s16, 4-channel rearrange)
func: 2540225 usec (avg: 25402.2, min = 16937, max = 68268, stddev = 10786.7).
orig: 3319852 usec (avg: 33198.5, min = 29571, max = 36957, stddev = 1250.39).
Checking special remap (float, 4-channel rearrange)
func: 3024414 usec (avg: 30244.1, min = 26153, max = 58105, stddev = 4506.01).
orig: 12643624 usec (avg: 126436, min = 120575, max = 159088, stddev = 5519.28).
benchmark code will be posted as follow-up patches
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
2014-04-16 15:07:25 +02:00
|
|
|
#include <pulse/xmalloc.h>
|
2009-08-20 18:23:42 +02:00
|
|
|
#include <pulse/sample.h>
|
2013-03-28 14:46:49 +01:00
|
|
|
#include <pulse/volume.h>
|
2009-08-20 18:23:42 +02:00
|
|
|
#include <pulsecore/log.h>
|
|
|
|
|
#include <pulsecore/macro.h>
|
|
|
|
|
|
|
|
|
|
#include "remap.h"
|
|
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
static void remap_mono_to_stereo_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
|
2009-08-20 18:23:42 +02:00
|
|
|
unsigned i;
|
|
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
for (i = n >> 2; i; i--) {
|
|
|
|
|
dst[0] = dst[1] = src[0];
|
|
|
|
|
dst[2] = dst[3] = src[1];
|
|
|
|
|
dst[4] = dst[5] = src[2];
|
|
|
|
|
dst[6] = dst[7] = src[3];
|
|
|
|
|
src += 4;
|
|
|
|
|
dst += 8;
|
|
|
|
|
}
|
|
|
|
|
for (i = n & 3; i; i--) {
|
|
|
|
|
dst[0] = dst[1] = src[0];
|
|
|
|
|
src++;
|
|
|
|
|
dst += 2;
|
|
|
|
|
}
|
|
|
|
|
}
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
static void remap_mono_to_stereo_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
|
|
|
|
|
unsigned i;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
for (i = n >> 2; i; i--) {
|
|
|
|
|
dst[0] = dst[1] = src[0];
|
|
|
|
|
dst[2] = dst[3] = src[1];
|
|
|
|
|
dst[4] = dst[5] = src[2];
|
|
|
|
|
dst[6] = dst[7] = src[3];
|
|
|
|
|
src += 4;
|
|
|
|
|
dst += 8;
|
|
|
|
|
}
|
|
|
|
|
for (i = n & 3; i; i--) {
|
|
|
|
|
dst[0] = dst[1] = src[0];
|
|
|
|
|
src++;
|
|
|
|
|
dst += 2;
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-27 22:22:03 +02:00
|
|
|
static void remap_channels_matrix_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
|
2009-08-20 18:23:42 +02:00
|
|
|
unsigned oc, ic, i;
|
|
|
|
|
unsigned n_ic, n_oc;
|
|
|
|
|
|
2014-04-16 11:25:58 +02:00
|
|
|
n_ic = m->i_ss.channels;
|
|
|
|
|
n_oc = m->o_ss.channels;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
memset(dst, 0, n * sizeof(int16_t) * n_oc);
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
for (oc = 0; oc < n_oc; oc++) {
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
for (ic = 0; ic < n_ic; ic++) {
|
2014-04-27 22:22:03 +02:00
|
|
|
int16_t *d = dst + oc;
|
|
|
|
|
const int16_t *s = src + ic;
|
|
|
|
|
int32_t vol = m->map_table_i[oc][ic];
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
if (vol <= 0)
|
|
|
|
|
continue;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
if (vol >= 0x10000) {
|
|
|
|
|
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
|
|
|
|
|
*d += *s;
|
|
|
|
|
} else {
|
|
|
|
|
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
|
|
|
|
|
*d += (int16_t) (((int32_t)*s * vol) >> 16);
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|
|
|
|
|
}
|
2014-04-16 11:58:11 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-27 22:22:03 +02:00
|
|
|
static void remap_channels_matrix_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
|
2014-04-16 11:58:11 +02:00
|
|
|
unsigned oc, ic, i;
|
|
|
|
|
unsigned n_ic, n_oc;
|
|
|
|
|
|
|
|
|
|
n_ic = m->i_ss.channels;
|
|
|
|
|
n_oc = m->o_ss.channels;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
memset(dst, 0, n * sizeof(float) * n_oc);
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
for (oc = 0; oc < n_oc; oc++) {
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:58:11 +02:00
|
|
|
for (ic = 0; ic < n_ic; ic++) {
|
2014-04-27 22:22:03 +02:00
|
|
|
float *d = dst + oc;
|
|
|
|
|
const float *s = src + ic;
|
|
|
|
|
float vol = m->map_table_f[oc][ic];
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 12:00:06 +02:00
|
|
|
if (vol <= 0.0f)
|
2014-04-16 11:58:11 +02:00
|
|
|
continue;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 12:00:06 +02:00
|
|
|
if (vol >= 1.0f) {
|
2014-04-16 11:58:11 +02:00
|
|
|
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
|
|
|
|
|
*d += *s;
|
|
|
|
|
} else {
|
|
|
|
|
for (i = n; i > 0; i--, s += n_ic, d += n_oc)
|
|
|
|
|
*d += *s * vol;
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-16 15:06:29 +02:00
|
|
|
bool pa_setup_remap_arrange(const pa_remap_t *m, int8_t arrange[PA_CHANNELS_MAX]) {
|
|
|
|
|
unsigned ic, oc;
|
|
|
|
|
unsigned n_ic, n_oc;
|
|
|
|
|
|
|
|
|
|
pa_assert(m);
|
|
|
|
|
|
|
|
|
|
n_ic = m->i_ss.channels;
|
|
|
|
|
n_oc = m->o_ss.channels;
|
|
|
|
|
|
|
|
|
|
for (oc = 0; oc < n_oc; oc++) {
|
|
|
|
|
arrange[oc] = -1;
|
|
|
|
|
for (ic = 0; ic < n_ic; ic++) {
|
|
|
|
|
int32_t vol = m->map_table_i[oc][ic];
|
|
|
|
|
|
|
|
|
|
/* input channel is not used */
|
|
|
|
|
if (vol == 0)
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
/* if mixing this channel, we cannot just rearrange */
|
|
|
|
|
if (vol != 0x10000 || arrange[oc] >= 0)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
arrange[oc] = ic;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
remap: Add special remapping case which just re-arranges channels
Input channels may just be copied to output channels, no mixing; this
avoids the generic (slow) matrix remapping code in cases where channels
are dropped or reordered.
This makes use of the remap struct state introduced earlier.
on Intel Core i7-870 @ 2.93 GHz (GCC 4.6, 64-bit):
Checking special remap (s16, stereo rearrange)
func: 126117 usec (avg: 1261.17, min = 1150, max = 2111, stddev = 117.332).
orig: 190509 usec (avg: 1905.09, min = 1807, max = 2402, stddev = 100.984).
Checking special remap (float, stereo rearrange)
func: 194329 usec (avg: 1943.29, min = 1876, max = 2127, stddev = 64.3486).
orig: 205263 usec (avg: 2052.63, min = 2005, max = 2452, stddev = 70.177).
Checking special remap (s16, 4-channel rearrange)
func: 278754 usec (avg: 2787.54, min = 2719, max = 3093, stddev = 78.22).
orig: 383885 usec (avg: 3838.85, min = 3634, max = 4121, stddev = 128.522).
Checking special remap (float, 4-channel rearrange)
func: 312429 usec (avg: 3124.29, min = 3017, max = 3498, stddev = 120.127).
orig: 388198 usec (avg: 3881.98, min = 3768, max = 4655, stddev = 138.441).
on ARM Cortex-A8 (TI OMAP3 DM3730 @ 1GHz) (Linaro GCC 4.6):
Checking special remap (s16, stereo rearrange)
func: 1204647 usec (avg: 12046.5, min = 10406, max = 25451, stddev = 2491.9).
orig: 1660311 usec (avg: 16603.1, min = 14740, max = 20416, stddev = 1708.07).
Checking special remap (float, stereo rearrange)
func: 1391392 usec (avg: 13913.9, min = 12207, max = 28260, stddev = 2238.12).
orig: 9246707 usec (avg: 92467.1, min = 87525, max = 125611, stddev = 5494.64).
Checking special remap (s16, 4-channel rearrange)
func: 2540225 usec (avg: 25402.2, min = 16937, max = 68268, stddev = 10786.7).
orig: 3319852 usec (avg: 33198.5, min = 29571, max = 36957, stddev = 1250.39).
Checking special remap (float, 4-channel rearrange)
func: 3024414 usec (avg: 30244.1, min = 26153, max = 58105, stddev = 4506.01).
orig: 12643624 usec (avg: 126436, min = 120575, max = 159088, stddev = 5519.28).
benchmark code will be posted as follow-up patches
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
2014-04-16 15:07:25 +02:00
|
|
|
static void remap_arrange_stereo_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
|
|
|
|
|
const unsigned n_ic = m->i_ss.channels;
|
|
|
|
|
const int8_t *arrange = m->state;
|
|
|
|
|
const int8_t ic0 = arrange[0], ic1 = arrange[1];
|
|
|
|
|
|
|
|
|
|
for (; n > 0; n--) {
|
|
|
|
|
*dst++ = (ic0 >= 0) ? *(src + ic0) : 0;
|
|
|
|
|
*dst++ = (ic1 >= 0) ? *(src + ic1) : 0;
|
|
|
|
|
src += n_ic;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void remap_arrange_ch4_s16ne_c(pa_remap_t *m, int16_t *dst, const int16_t *src, unsigned n) {
|
|
|
|
|
const unsigned n_ic = m->i_ss.channels;
|
|
|
|
|
const int8_t *arrange = m->state;
|
|
|
|
|
const int8_t ic0 = arrange[0], ic1 = arrange[1],
|
|
|
|
|
ic2 = arrange[2], ic3 = arrange[3];
|
|
|
|
|
|
|
|
|
|
for (; n > 0; n--) {
|
|
|
|
|
*dst++ = (ic0 >= 0) ? *(src + ic0) : 0;
|
|
|
|
|
*dst++ = (ic1 >= 0) ? *(src + ic1) : 0;
|
|
|
|
|
*dst++ = (ic2 >= 0) ? *(src + ic2) : 0;
|
|
|
|
|
*dst++ = (ic3 >= 0) ? *(src + ic3) : 0;
|
|
|
|
|
src += n_ic;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void remap_arrange_stereo_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
|
|
|
|
|
const unsigned n_ic = m->i_ss.channels;
|
|
|
|
|
const int8_t *arrange = m->state;
|
|
|
|
|
const int ic0 = arrange[0], ic1 = arrange[1];
|
|
|
|
|
|
|
|
|
|
for (; n > 0; n--) {
|
|
|
|
|
*dst++ = (ic0 >= 0) ? *(src + ic0) : 0.0f;
|
|
|
|
|
*dst++ = (ic1 >= 0) ? *(src + ic1) : 0.0f;
|
|
|
|
|
src += n_ic;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void remap_arrange_ch4_float32ne_c(pa_remap_t *m, float *dst, const float *src, unsigned n) {
|
|
|
|
|
const unsigned n_ic = m->i_ss.channels;
|
|
|
|
|
const int8_t *arrange = m->state;
|
|
|
|
|
const int ic0 = arrange[0], ic1 = arrange[1],
|
|
|
|
|
ic2 = arrange[2], ic3 = arrange[3];
|
|
|
|
|
|
|
|
|
|
for (; n > 0; n--) {
|
|
|
|
|
*dst++ = (ic0 >= 0) ? *(src + ic0) : 0.0f;
|
|
|
|
|
*dst++ = (ic1 >= 0) ? *(src + ic1) : 0.0f;
|
|
|
|
|
*dst++ = (ic2 >= 0) ? *(src + ic2) : 0.0f;
|
|
|
|
|
*dst++ = (ic3 >= 0) ? *(src + ic3) : 0.0f;
|
|
|
|
|
src += n_ic;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2014-04-22 17:45:23 +02:00
|
|
|
void pa_set_remap_func(pa_remap_t *m, pa_do_remap_func_t func_s16,
|
|
|
|
|
pa_do_remap_func_t func_float) {
|
|
|
|
|
|
|
|
|
|
pa_assert(m);
|
|
|
|
|
|
|
|
|
|
if (m->format == PA_SAMPLE_S16NE)
|
|
|
|
|
m->do_remap = func_s16;
|
|
|
|
|
else if (m->format == PA_SAMPLE_FLOAT32NE)
|
|
|
|
|
m->do_remap = func_float;
|
|
|
|
|
else
|
|
|
|
|
pa_assert_not_reached();
|
|
|
|
|
}
|
|
|
|
|
|
2009-08-20 18:23:42 +02:00
|
|
|
/* set the function that will execute the remapping based on the matrices */
|
2011-03-02 12:41:26 +01:00
|
|
|
static void init_remap_c(pa_remap_t *m) {
|
2009-08-20 18:23:42 +02:00
|
|
|
unsigned n_oc, n_ic;
|
remap: Add special remapping case which just re-arranges channels
Input channels may just be copied to output channels, no mixing; this
avoids the generic (slow) matrix remapping code in cases where channels
are dropped or reordered.
This makes use of the remap struct state introduced earlier.
on Intel Core i7-870 @ 2.93 GHz (GCC 4.6, 64-bit):
Checking special remap (s16, stereo rearrange)
func: 126117 usec (avg: 1261.17, min = 1150, max = 2111, stddev = 117.332).
orig: 190509 usec (avg: 1905.09, min = 1807, max = 2402, stddev = 100.984).
Checking special remap (float, stereo rearrange)
func: 194329 usec (avg: 1943.29, min = 1876, max = 2127, stddev = 64.3486).
orig: 205263 usec (avg: 2052.63, min = 2005, max = 2452, stddev = 70.177).
Checking special remap (s16, 4-channel rearrange)
func: 278754 usec (avg: 2787.54, min = 2719, max = 3093, stddev = 78.22).
orig: 383885 usec (avg: 3838.85, min = 3634, max = 4121, stddev = 128.522).
Checking special remap (float, 4-channel rearrange)
func: 312429 usec (avg: 3124.29, min = 3017, max = 3498, stddev = 120.127).
orig: 388198 usec (avg: 3881.98, min = 3768, max = 4655, stddev = 138.441).
on ARM Cortex-A8 (TI OMAP3 DM3730 @ 1GHz) (Linaro GCC 4.6):
Checking special remap (s16, stereo rearrange)
func: 1204647 usec (avg: 12046.5, min = 10406, max = 25451, stddev = 2491.9).
orig: 1660311 usec (avg: 16603.1, min = 14740, max = 20416, stddev = 1708.07).
Checking special remap (float, stereo rearrange)
func: 1391392 usec (avg: 13913.9, min = 12207, max = 28260, stddev = 2238.12).
orig: 9246707 usec (avg: 92467.1, min = 87525, max = 125611, stddev = 5494.64).
Checking special remap (s16, 4-channel rearrange)
func: 2540225 usec (avg: 25402.2, min = 16937, max = 68268, stddev = 10786.7).
orig: 3319852 usec (avg: 33198.5, min = 29571, max = 36957, stddev = 1250.39).
Checking special remap (float, 4-channel rearrange)
func: 3024414 usec (avg: 30244.1, min = 26153, max = 58105, stddev = 4506.01).
orig: 12643624 usec (avg: 126436, min = 120575, max = 159088, stddev = 5519.28).
benchmark code will be posted as follow-up patches
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
2014-04-16 15:07:25 +02:00
|
|
|
int8_t arrange[PA_CHANNELS_MAX];
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:25:58 +02:00
|
|
|
n_oc = m->o_ss.channels;
|
|
|
|
|
n_ic = m->i_ss.channels;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
|
|
|
|
/* find some common channel remappings, fall back to full matrix operation. */
|
|
|
|
|
if (n_ic == 1 && n_oc == 2 &&
|
2014-04-16 19:24:01 +02:00
|
|
|
m->map_table_i[0][0] == 0x10000 && m->map_table_i[1][0] == 0x10000) {
|
2014-04-16 11:58:11 +02:00
|
|
|
|
2009-08-20 18:23:42 +02:00
|
|
|
pa_log_info("Using mono to stereo remapping");
|
2014-04-22 17:45:23 +02:00
|
|
|
pa_set_remap_func(m, (pa_do_remap_func_t) remap_mono_to_stereo_s16ne_c,
|
|
|
|
|
(pa_do_remap_func_t) remap_mono_to_stereo_float32ne_c);
|
remap: Add special remapping case which just re-arranges channels
Input channels may just be copied to output channels, no mixing; this
avoids the generic (slow) matrix remapping code in cases where channels
are dropped or reordered.
This makes use of the remap struct state introduced earlier.
on Intel Core i7-870 @ 2.93 GHz (GCC 4.6, 64-bit):
Checking special remap (s16, stereo rearrange)
func: 126117 usec (avg: 1261.17, min = 1150, max = 2111, stddev = 117.332).
orig: 190509 usec (avg: 1905.09, min = 1807, max = 2402, stddev = 100.984).
Checking special remap (float, stereo rearrange)
func: 194329 usec (avg: 1943.29, min = 1876, max = 2127, stddev = 64.3486).
orig: 205263 usec (avg: 2052.63, min = 2005, max = 2452, stddev = 70.177).
Checking special remap (s16, 4-channel rearrange)
func: 278754 usec (avg: 2787.54, min = 2719, max = 3093, stddev = 78.22).
orig: 383885 usec (avg: 3838.85, min = 3634, max = 4121, stddev = 128.522).
Checking special remap (float, 4-channel rearrange)
func: 312429 usec (avg: 3124.29, min = 3017, max = 3498, stddev = 120.127).
orig: 388198 usec (avg: 3881.98, min = 3768, max = 4655, stddev = 138.441).
on ARM Cortex-A8 (TI OMAP3 DM3730 @ 1GHz) (Linaro GCC 4.6):
Checking special remap (s16, stereo rearrange)
func: 1204647 usec (avg: 12046.5, min = 10406, max = 25451, stddev = 2491.9).
orig: 1660311 usec (avg: 16603.1, min = 14740, max = 20416, stddev = 1708.07).
Checking special remap (float, stereo rearrange)
func: 1391392 usec (avg: 13913.9, min = 12207, max = 28260, stddev = 2238.12).
orig: 9246707 usec (avg: 92467.1, min = 87525, max = 125611, stddev = 5494.64).
Checking special remap (s16, 4-channel rearrange)
func: 2540225 usec (avg: 25402.2, min = 16937, max = 68268, stddev = 10786.7).
orig: 3319852 usec (avg: 33198.5, min = 29571, max = 36957, stddev = 1250.39).
Checking special remap (float, 4-channel rearrange)
func: 3024414 usec (avg: 30244.1, min = 26153, max = 58105, stddev = 4506.01).
orig: 12643624 usec (avg: 126436, min = 120575, max = 159088, stddev = 5519.28).
benchmark code will be posted as follow-up patches
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
2014-04-16 15:07:25 +02:00
|
|
|
} else if (pa_setup_remap_arrange(m, arrange) && n_oc == 2) {
|
|
|
|
|
|
|
|
|
|
pa_log_info("Using stereo arrange remapping");
|
|
|
|
|
pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_stereo_s16ne_c,
|
|
|
|
|
(pa_do_remap_func_t) remap_arrange_stereo_float32ne_c);
|
|
|
|
|
|
|
|
|
|
/* setup state */
|
|
|
|
|
m->state = pa_xnewdup(int8_t, arrange, PA_CHANNELS_MAX);
|
|
|
|
|
} else if (pa_setup_remap_arrange(m, arrange) && n_oc == 4) {
|
|
|
|
|
|
|
|
|
|
pa_log_info("Using 4-channel arrange remapping");
|
|
|
|
|
pa_set_remap_func(m, (pa_do_remap_func_t) remap_arrange_ch4_s16ne_c,
|
|
|
|
|
(pa_do_remap_func_t) remap_arrange_ch4_float32ne_c);
|
|
|
|
|
|
|
|
|
|
/* setup state */
|
|
|
|
|
m->state = pa_xnewdup(int8_t, arrange, PA_CHANNELS_MAX);
|
2009-08-20 18:23:42 +02:00
|
|
|
} else {
|
2014-04-22 17:45:23 +02:00
|
|
|
|
remap: Add special remapping case which just re-arranges channels
Input channels may just be copied to output channels, no mixing; this
avoids the generic (slow) matrix remapping code in cases where channels
are dropped or reordered.
This makes use of the remap struct state introduced earlier.
on Intel Core i7-870 @ 2.93 GHz (GCC 4.6, 64-bit):
Checking special remap (s16, stereo rearrange)
func: 126117 usec (avg: 1261.17, min = 1150, max = 2111, stddev = 117.332).
orig: 190509 usec (avg: 1905.09, min = 1807, max = 2402, stddev = 100.984).
Checking special remap (float, stereo rearrange)
func: 194329 usec (avg: 1943.29, min = 1876, max = 2127, stddev = 64.3486).
orig: 205263 usec (avg: 2052.63, min = 2005, max = 2452, stddev = 70.177).
Checking special remap (s16, 4-channel rearrange)
func: 278754 usec (avg: 2787.54, min = 2719, max = 3093, stddev = 78.22).
orig: 383885 usec (avg: 3838.85, min = 3634, max = 4121, stddev = 128.522).
Checking special remap (float, 4-channel rearrange)
func: 312429 usec (avg: 3124.29, min = 3017, max = 3498, stddev = 120.127).
orig: 388198 usec (avg: 3881.98, min = 3768, max = 4655, stddev = 138.441).
on ARM Cortex-A8 (TI OMAP3 DM3730 @ 1GHz) (Linaro GCC 4.6):
Checking special remap (s16, stereo rearrange)
func: 1204647 usec (avg: 12046.5, min = 10406, max = 25451, stddev = 2491.9).
orig: 1660311 usec (avg: 16603.1, min = 14740, max = 20416, stddev = 1708.07).
Checking special remap (float, stereo rearrange)
func: 1391392 usec (avg: 13913.9, min = 12207, max = 28260, stddev = 2238.12).
orig: 9246707 usec (avg: 92467.1, min = 87525, max = 125611, stddev = 5494.64).
Checking special remap (s16, 4-channel rearrange)
func: 2540225 usec (avg: 25402.2, min = 16937, max = 68268, stddev = 10786.7).
orig: 3319852 usec (avg: 33198.5, min = 29571, max = 36957, stddev = 1250.39).
Checking special remap (float, 4-channel rearrange)
func: 3024414 usec (avg: 30244.1, min = 26153, max = 58105, stddev = 4506.01).
orig: 12643624 usec (avg: 126436, min = 120575, max = 159088, stddev = 5519.28).
benchmark code will be posted as follow-up patches
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
2014-04-16 15:07:25 +02:00
|
|
|
pa_log_info("Using generic matrix remapping");
|
2014-04-27 22:22:03 +02:00
|
|
|
pa_set_remap_func(m, (pa_do_remap_func_t) remap_channels_matrix_s16ne_c,
|
|
|
|
|
(pa_do_remap_func_t) remap_channels_matrix_float32ne_c);
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* default C implementation */
|
2014-04-16 11:37:50 +02:00
|
|
|
static pa_init_remap_func_t init_remap_func = init_remap_c;
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2014-04-16 11:37:50 +02:00
|
|
|
void pa_init_remap_func(pa_remap_t *m) {
|
|
|
|
|
pa_assert(init_remap_func);
|
2009-08-20 18:23:42 +02:00
|
|
|
|
2009-08-20 18:32:51 +02:00
|
|
|
m->do_remap = NULL;
|
|
|
|
|
|
|
|
|
|
/* call the installed remap init function */
|
2014-04-16 11:37:50 +02:00
|
|
|
init_remap_func(m);
|
2009-08-20 18:29:02 +02:00
|
|
|
|
|
|
|
|
if (m->do_remap == NULL) {
|
2009-08-20 18:32:51 +02:00
|
|
|
/* nothing was installed, fallback to C version */
|
2011-03-02 12:41:26 +01:00
|
|
|
init_remap_c(m);
|
2009-08-20 18:29:02 +02:00
|
|
|
}
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pa_init_remap_func_t pa_get_init_remap_func(void) {
|
2014-04-16 11:37:50 +02:00
|
|
|
return init_remap_func;
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void pa_set_init_remap_func(pa_init_remap_func_t func) {
|
2014-04-16 11:37:50 +02:00
|
|
|
init_remap_func = func;
|
2009-08-20 18:23:42 +02:00
|
|
|
}
|