*/
#include <cmath>
-#include <ardour/types.h>
-#include <ardour/utils.h>
-#include <ardour/mix.h>
+#include "ardour/types.h"
+#include "ardour/utils.h"
+#include "ardour/mix.h"
+#include "ardour/runtime_functions.h"
#include <stdint.h>
+using std::min;
+using std::max;
+using namespace ARDOUR;
+
#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
// Debug wrappers
float
-debug_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current)
+debug_compute_peak (ARDOUR::Sample *buf, pframes_t nsamples, float current)
{
if ( ((intptr_t)buf % 16) != 0) {
- cerr << "compute_peak(): buffer unaligned!" << endl;
+ std::cerr << "compute_peak(): buffer unaligned!" << std::endl;
}
return x86_sse_compute_peak(buf, nsamples, current);
}
void
-debug_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain)
+debug_apply_gain_to_buffer (ARDOUR::Sample *buf, pframes_t nframes, float gain)
{
if ( ((intptr_t)buf % 16) != 0) {
- cerr << "apply_gain_to_buffer(): buffer unaligned!" << endl;
+ std::cerr << "apply_gain_to_buffer(): buffer unaligned!" << std::endl;
}
x86_sse_apply_gain_to_buffer(buf, nframes, gain);
}
void
-debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain)
+debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, pframes_t nframes, float gain)
{
if ( ((intptr_t)dst & 15) != 0) {
- cerr << "mix_buffers_with_gain(): dst unaligned!" << endl;
+ std::cerr << "mix_buffers_with_gain(): dst unaligned!" << std::endl;
}
if ( ((intptr_t)dst & 15) != ((intptr_t)src & 15) ) {
- cerr << "mix_buffers_with_gain(): dst & src don't have the same alignment!" << endl;
+ std::cerr << "mix_buffers_with_gain(): dst & src don't have the same alignment!" << std::endl;
mix_buffers_with_gain(dst, src, nframes, gain);
} else {
x86_sse_mix_buffers_with_gain(dst, src, nframes, gain);
}
void
-debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes)
+debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, pframes_t nframes)
{
if ( ((intptr_t)dst & 15) != 0) {
- cerr << "mix_buffers_no_gain(): dst unaligned!" << endl;
+ std::cerr << "mix_buffers_no_gain(): dst unaligned!" << std::endl;
}
if ( ((intptr_t)dst & 15) != ((intptr_t)src & 15) ) {
- cerr << "mix_buffers_no_gain(): dst & src don't have the same alignment!" << endl;
+ std::cerr << "mix_buffers_no_gain(): dst & src don't have the same alignment!" << std::endl;
mix_buffers_no_gain(dst, src, nframes);
} else {
x86_sse_mix_buffers_no_gain(dst, src, nframes);
float
-compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current)
+default_compute_peak (const ARDOUR::Sample * buf, pframes_t nsamples, float current)
{
- for (nframes_t i = 0; i < nsamples; ++i) {
+ for (pframes_t i = 0; i < nsamples; ++i) {
current = f_max (current, fabsf (buf[i]));
}
return current;
-}
+}
-float
-find_peaks (ARDOUR::Sample *buf, nframes_t nframes, float *min, float *max)
+void
+default_find_peaks (const ARDOUR::Sample * buf, pframes_t nframes, float *minf, float *maxf)
{
- long i;
+ pframes_t i;
float a, b;
- a = *max;
- b = *min;
+ a = *maxf;
+ b = *minf;
- for (i = 0; i < nframes; i++)
+ for (i = 0; i < nframes; i++)
{
- a = fmax (buf[i], a);
- b = fmin (buf[i], b);
+ a = max (buf[i], a);
+ b = min (buf[i], b);
}
- *max = a;
- *min = b;
+ *maxf = a;
+ *minf = b;
}
void
-apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain)
-{
- for (nframes_t i=0; i<nframes; i++)
+default_apply_gain_to_buffer (ARDOUR::Sample * buf, pframes_t nframes, float gain)
+{
+ for (pframes_t i=0; i<nframes; i++)
buf[i] *= gain;
}
void
-mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain)
+default_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes, float gain)
{
- for (nframes_t i = 0; i < nframes; i++) {
+ for (pframes_t i = 0; i < nframes; i++) {
dst[i] += src[i] * gain;
}
}
void
-mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes)
+default_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes)
{
- for (nframes_t i=0; i < nframes; i++) {
+ for (pframes_t i=0; i < nframes; i++) {
dst[i] += src[i];
}
}
#include <Accelerate/Accelerate.h>
float
-veclib_compute_peak (ARDOUR::Sample *buf, nframes_t nsamples, float current)
+veclib_compute_peak (const ARDOUR::Sample * buf, pframes_t nsamples, float current)
{
float tmpmax = 0.0f;
- vDSP_maxmgv(buf, 1, &tmpmax, nsamples);
- return f_max(current, tmpmax);
+ vDSP_maxmgv(buf, 1, &tmpmax, nsamples);
+ return f_max(current, tmpmax);
}
-float
-veclib_find_peaks (ARDOUR::Sample *buf, nframes_t nframes, float *min, float *max)
+void
+veclib_find_peaks (const ARDOUR::Sample * buf, pframes_t nframes, float *min, float *max)
{
- // TODO: someone with veclib skills needs to write this one
- long i;
- float a, b;
-
- a = *max;
- b = *min;
-
- for (i = 0; i < nframes; i++)
- {
- a = fmax (buf[i], a);
- b = fmin (buf[i], b);
- }
-
- *max = a;
- *min = b;
+ vDSP_maxv (const_cast<ARDOUR::Sample*>(buf), 1, max, nframes);
+ vDSP_minv (const_cast<ARDOUR::Sample*>(buf), 1, min, nframes);
}
+
void
-veclib_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_t nframes, float gain)
+veclib_apply_gain_to_buffer (ARDOUR::Sample * buf, pframes_t nframes, float gain)
{
- vDSP_vsmul(buf, 1, &gain, buf, 1, nframes);
+ vDSP_vsmul(buf, 1, &gain, buf, 1, nframes);
}
void
-veclib_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes, float gain)
+veclib_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes, float gain)
{
- vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
+ vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
}
void
-veclib_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_t nframes)
+veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, pframes_t nframes)
{
- // It seems that a vector mult only operation does not exist...
- float gain = 1.0f;
- vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
+ // It seems that a vector mult only operation does not exist...
+ float gain = 1.0f;
+ vDSP_vsma(src, 1, &gain, dst, 1, dst, 1, nframes);
}
#endif
-
+