From 52e49500bb78974d43bdfd30b2ec9b2a4522dd25 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 26 Feb 2010 01:39:16 +0000 Subject: Perform all mixing for an audio input in a single mix operation (instead of a two step polyphony mixdown (by connections) and connections mixdown (by ports)). Speed up and inline AudioBuffer::accumulate, to speed up mix(). Remove local buffer from Connection (always mix into destination InputPort's buffers). git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2494 a436a847-0d15-0410-975c-d299462d15a1 --- src/engine/AudioBuffer.hpp | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) (limited to 'src/engine/AudioBuffer.hpp') diff --git a/src/engine/AudioBuffer.hpp b/src/engine/AudioBuffer.hpp index cfac3d59..7edfdef3 100644 --- a/src/engine/AudioBuffer.hpp +++ b/src/engine/AudioBuffer.hpp @@ -23,6 +23,7 @@ #include #include "types.hpp" #include "ObjectBuffer.hpp" +#include "Context.hpp" using namespace std; @@ -42,7 +43,7 @@ public: void copy(Context& context, const Buffer* src); void accumulate(Context& context, const AudioBuffer* src); - bool is_control() const { return _type.symbol() == Shared::PortType::CONTROL; } + inline bool is_control() const { return _type.symbol() == Shared::PortType::CONTROL; } inline Sample* data() const { return (is_control()) @@ -75,6 +76,35 @@ private: }; +/** Accumulate a block of @a src into buffer. + */ +inline void +AudioBuffer::accumulate(Context& context, const AudioBuffer* const src) +{ + Sample* const buf = data(); + const Sample* const src_buf = src->data(); + + if (is_control()) { + if (src->is_control()) { // control => control + buf[0] += src_buf[0]; + } else { // audio => control + buf[0] += src_buf[context.offset()]; + } + } else { + const SampleCount end = context.offset() + context.nframes(); + if (src->is_control()) { // control => audio + for (SampleCount i = context.offset(); i < end; ++i) { + buf[i] += src_buf[0]; + } + } else { // audio => audio + for (SampleCount i = context.offset(); i < end; ++i) { + buf[i] += src_buf[i]; + } + } + } +} + + } // namespace Ingen #endif // INGEN_ENGINE_AUDIOBUFFER_HPP -- cgit v1.2.1