X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fmix.cc;h=c058dec06b10e45d73f7ff590be5610ce5f429c6;hb=706d6e8ff06b32f2b7cefcb09fd81051c3f80735;hp=c6e234d87bb4997b33e375c89496e6b89328a148;hpb=79986643c0c904f6574bb5323e2233a43a9e622e;p=ardour.git

diff --git a/libs/ardour/mix.cc b/libs/ardour/mix.cc
index c6e234d87b..c058dec06b 100644
--- a/libs/ardour/mix.cc
+++ b/libs/ardour/mix.cc
@@ -15,48 +15,49 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id$
 */
 
 #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>
 
-#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
+using namespace ARDOUR;
 
+#if defined (ARCH_X86) && defined (BUILD_SSE_OPTIMIZATIONS)
 // Debug wrappers
 
 float
-debug_compute_peak (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current) 
+debug_compute_peak (ARDOUR::Sample *buf, nframes_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, jack_nframes_t nframes, float gain)
+debug_apply_gain_to_buffer (ARDOUR::Sample *buf, nframes_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, jack_nframes_t nframes, float gain)
+debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_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);
@@ -64,14 +65,14 @@ debug_mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nfra
 }
 
 void
-debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes)
+debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, nframes_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);
@@ -82,34 +83,53 @@ debug_mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframe
 
 
 float
-compute_peak (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current) 
+default_compute_peak (const ARDOUR::Sample * buf, nframes_t nsamples, float current)
 {
-	for (jack_nframes_t i = 0; i < nsamples; ++i) {
+	for (nframes_t i = 0; i < nsamples; ++i) {
 		current = f_max (current, fabsf (buf[i]));
 	}
 
 	return current;
-}	
+}
 
 void
-apply_gain_to_buffer (ARDOUR::Sample *buf, jack_nframes_t nframes, float gain)
-{		
-	for (jack_nframes_t i=0; i<nframes; i++)
+default_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, float *max)
+{
+	nframes_t 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;
+}
+
+void
+default_apply_gain_to_buffer (ARDOUR::Sample * buf, nframes_t nframes, float gain)
+{
+	for (nframes_t i=0; i<nframes; i++)
 		buf[i] *= gain;
 }
 
 void
-mix_buffers_with_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes, float gain)
+default_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes, float gain)
 {
-	for (jack_nframes_t i = 0; i < nframes; i++) {
+	for (nframes_t i = 0; i < nframes; i++) {
 		dst[i] += src[i] * gain;
 	}
 }
 
 void
-mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nframes)
+default_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_t nframes)
 {
-	for (jack_nframes_t i=0; i < nframes; i++) {
+	for (nframes_t i=0; i < nframes; i++) {
 		dst[i] += src[i];
 	}
 }
@@ -118,33 +138,40 @@ mix_buffers_no_gain (ARDOUR::Sample *dst, ARDOUR::Sample *src, jack_nframes_t nf
 #include <Accelerate/Accelerate.h>
 
 float
-veclib_compute_peak (ARDOUR::Sample *buf, jack_nframes_t nsamples, float current)
+veclib_compute_peak (const ARDOUR::Sample * buf, nframes_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);
+}
+
+void
+veclib_find_peaks (const ARDOUR::Sample * buf, nframes_t nframes, float *min, float *max)
+{
+	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, jack_nframes_t nframes, float gain)
+veclib_apply_gain_to_buffer (ARDOUR::Sample * buf, nframes_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, jack_nframes_t nframes, float gain)
+veclib_mix_buffers_with_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_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, jack_nframes_t nframes)
+veclib_mix_buffers_no_gain (ARDOUR::Sample * dst, const ARDOUR::Sample * src, nframes_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
-		
+