beeps 0.1.32 → 0.1.33

data/src/signals.cpp

@@ -2,6 +2,9 @@
 
 
 #include <memory>
+#include <algorithm>
+#include <AudioFile.h>
+#include <CDSPResampler.h>
 #include "beeps/beeps.h"
 #include "beeps/exception.h"
 
@@ -13,12 +16,14 @@ namespace Beeps
 	struct Signals::Data
 	{
 
-		std::unique_ptr<stk::StkFrames> frames;
+		std::unique_ptr<Frames> frames;
+
+		uint nsamples = 0;
 
 	};// Signals::Data
 
 
-	stk::StkFrames*
+	Frames*
 	Signals_get_frames (Signals* signals)
 	{
 		if (!signals)
@@ -27,19 +32,304 @@ namespace Beeps
 		return signals->self->frames.get();
 	}
 
-	const stk::StkFrames*
+	const Frames*
 	Signals_get_frames (const Signals* signals)
 	{
 		return Signals_get_frames(const_cast<Signals*>(signals));
 	}
 
+	Signals
+	Signals_create (uint capacity, uint nchannels, double sample_rate)
+	{
+		if (capacity <= 0 || nchannels <= 0)
+			argument_error(__FILE__, __LINE__);
+
+		if (sample_rate <= 0) sample_rate = Beeps::sample_rate();
+
+		Signals s;
+		s.self->frames.reset(new Frames(capacity, nchannels));
+		s.self->frames->setDataRate(sample_rate);
+		return s;
+	}
+
+	Signals
+	Signals_create (
+		const float* const* channels,
+		uint nsamples, uint nchannels, double sample_rate)
+	{
+		if (!channels || nsamples <= 0 || nchannels <= 0)
+			argument_error(__FILE__, __LINE__);
+
+		if (sample_rate <= 0) sample_rate = Beeps::sample_rate();
+
+		Frames* frames = new Frames(nsamples, nchannels);
+		frames->setDataRate(sample_rate);
+
+		for (uint channel = 0; channel < nchannels; ++channel)
+			for (uint sample = 0; sample < nsamples; ++sample)
+				(*frames)(sample, channel) = channels[channel][sample];
+
+		Signals s;
+		s.self->frames.reset(frames);
+		s.self->nsamples = nsamples;
+		return s;
+	}
+
+	void
+	Signals_resize (Signals* signals, uint capacity)
+	{
+		if (!signals || !*signals || capacity <= 0)
+			argument_error(__FILE__, __LINE__);
+
+		signals->self->frames->resize(capacity, signals->nchannels());
+		Signals_clear(signals);
+	}
+
+	void
+	Signals_resize (Signals* signals, uint nsamples, Float value)
+	{
+		Signals_resize(signals, nsamples);
+
+		Frames* frames = Signals_get_frames(signals);
+		assert(frames);
+
+		Float* p    = &(*frames)(0, 0);
+		size_t size = frames->size();
+		for (size_t i = 0; i < size; ++i)
+			*p++ = value;
+
+		Signals_set_nsamples(signals, nsamples);
+	}
+
+	void
+	Signals_clear (Signals* signals)
+	{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+
+		signals->self->nsamples = 0;
+	}
+
+	static uint
+	copy_frames (Signals* to, const Signals& from, uint from_offset)
+	{
+		assert(to && *to && from);
+
+		if (from_offset >= from.nsamples())
+			return 0;
+
+		uint   to_offset   = to->nsamples();
+		uint   to_nsamples = to->capacity() - to_offset;
+		uint from_nsamples = from.nsamples();
+		uint copy_nsamples =
+			std::min(from_offset + to_nsamples, from_nsamples)
+			- from_offset;
+
+		      Frames*   to_frames = Signals_get_frames(to);
+		const Frames* from_frames = Signals_get_frames(&from);
+		assert(to_frames && from_frames);
+
+		for (uint channel = 0; channel < to_frames->nchannels(); ++channel)
+		{
+			uint from_channel = channel < from_frames->nchannels() ? channel : 0;
+
+			for (uint i = 0; i < copy_nsamples; ++i)
+			{
+				(*to_frames)(      to_offset + i,      channel) =
+					(*from_frames)(from_offset + i, from_channel);
+			}
+		}
+
+		to->self->nsamples += copy_nsamples;
+		return copy_nsamples;
+	}
+
+	static uint
+	resample_frames (Signals* to, const Signals& from, uint from_offset)
+	{
+		assert(to && *to && from);
+
+		if (from_offset >= from.nsamples())
+			return 0;
 
-	Signals::Signals (float seconds, uint channels)
+		uint    to_offset     = to->nsamples();
+		float          to_sec = (to->capacity() - to_offset) /  to->sample_rate();
+		float from_offset_sec = from_offset                  / from.sample_rate();
+		float        from_sec = from.nsamples()              / from.sample_rate();
+
+		float copy_seconds =
+			std::min(from_offset_sec + to_sec, from_sec) - from_offset_sec;
+
+		uint to_nsamples = 0, from_nsamples = 0;
+		if (from_offset_sec + to_sec <= from_sec)
+		{
+			  to_nsamples = to->capacity() - to->nsamples();
+			from_nsamples = copy_seconds * from.sample_rate();
+		}
+		else
+		{
+			to_nsamples = copy_seconds * to->sample_rate();
+			from_nsamples = from.nsamples() - from_offset;
+		}
+
+		r8b::CDSPResampler24 resampler(
+			from.sample_rate(), to->sample_rate(), from_nsamples);
+		r8b::CFixedBuffer<double> from_buf(from_nsamples), to_buf(to_nsamples);
+
+		      Frames*   to_frames = Signals_get_frames(to);
+		const Frames* from_frames = Signals_get_frames(&from);
+		assert(to_frames && from_frames);
+
+		for (uint channel = 0; channel < to_frames->nchannels(); ++channel)
+		{
+			uint from_channel = channel < from_frames->nchannels() ? channel : 0;
+
+			for (uint i = 0; i < from_nsamples; ++i)
+				from_buf[i] = (*from_frames)(from_offset + i, from_channel);
+
+			resampler.clear();
+			resampler.oneshot(
+				(const double*) from_buf, from_nsamples,
+				      (double*)   to_buf,   to_nsamples);
+
+			for (uint i = 0; i < to_nsamples; ++i)
+				(*to_frames)(to_offset + i, channel) = to_buf[i];
+		}
+
+		to->self->nsamples += to_nsamples;
+		return from_nsamples;
+	}
+
+	uint
+	Signals_copy (Signals* to, const Signals& from, uint from_offset)
 	{
-		if (seconds <= 0 || channels <= 0)
-			return;
+		if (!to || !*to || !from)
+			argument_error(__FILE__, __LINE__);
+
+		Signals_clear(to);
 
-		self->frames.reset(new stk::StkFrames(seconds * sampling_rate(), channels));
+		if (to->sample_rate() == from.sample_rate())
+			return copy_frames(to, from, from_offset);
+		else
+			return resample_frames(to, from, from_offset);
+	}
+
+	void
+	Signals_apply (Signals* signals, const Signals& multiplier)
+	{
+		if (!signals || multiplier.nchannels() != 1)
+			argument_error(__FILE__, __LINE__);
+
+		if (signals->capacity() != multiplier.capacity())
+			argument_error(__FILE__, __LINE__);
+
+		Frames* sigf = Signals_get_frames(signals);
+		Frames* mulf = Signals_get_frames(const_cast<Signals*>(&multiplier));
+
+		for (uint ch = 0; ch < sigf->nchannels(); ++ch)
+		{
+			Float* sigp  = &(*sigf)(0, ch);
+			Float* mulp  = &(*mulf)(0, 0);
+			uint nframes = sigf->nframes();
+			uint stride  = sigf->nchannels();
+			for (uint i = 0; i < nframes; ++i, sigp += stride, ++mulp)
+				*sigp *= *mulp;
+		}
+	}
+
+	template <typename T>
+	void
+	write_samples (Signals* signals, const SignalSamples<T>& samples, long nsamples_)
+	{
+		uint nsamples = nsamples_ < 0 ? samples.nsamples() : (uint) nsamples_;
+
+		if (
+			!signals || !*signals ||
+			signals->nchannels() != samples.nchannels() ||
+			signals->capacity() < nsamples)
+		{
+			argument_error(__FILE__, __LINE__);
+		}
+
+		Frames* f = Signals_get_frames(signals);
+		assert(f);
+
+		for (uint channel = 0; channel < signals->nchannels(); ++channel)
+		{
+			const T* buf = samples.channel(channel);
+			for (uint sample = 0; sample < nsamples; ++sample)
+				(*f)(sample, channel) = buf[sample];
+		}
+
+		signals->self->nsamples = nsamples;
+	}
+
+	template <>
+	void
+	Signals_write_samples (
+		Signals* signals, const SignalSamples<float>& samples, long nsamples)
+	{
+		write_samples(signals, samples, nsamples);
+	}
+
+	template <>
+	void
+	Signals_write_samples (
+		Signals* signals, const SignalSamples<double>& samples, long nsamples)
+	{
+		write_samples(signals, samples, nsamples);
+	}
+
+	void
+	Signals_set_nsamples (Signals* signals, uint nsamples)
+	{
+		if (!signals)
+			argument_error(__FILE__, __LINE__);
+
+		signals->self->nsamples = nsamples;
+	}
+
+	float
+	Signals_get_seconds (const Signals& signals)
+	{
+		return (float) (signals.nsamples() / signals.sample_rate());
+	}
+
+	static void
+	make_audio_buffer (
+		AudioFile<float>::AudioBuffer* buffer, const Signals& signals)
+	{
+		assert(buffer && signals);
+
+		const Frames* frames = Signals_get_frames(&signals);
+		assert(frames);
+
+		buffer->clear();
+		for (uint ch = 0; ch < frames->nchannels(); ++ch)
+		{
+			buffer->emplace_back(std::vector<float>());
+			auto& channel = buffer->back();
+
+			uint nframes = frames->nframes();
+			channel.reserve(nframes);
+
+			for (uint i = 0; i < nframes; ++i)
+				channel.emplace_back((*frames)(i, ch));
+		}
+	}
+
+	void
+	Signals_save (const Signals& signals, const char* path)
+	{
+		AudioFile<float> file;
+		file.setSampleRate(signals.sample_rate());
+		make_audio_buffer(&file.samples, signals);
+		file.save(path);
+	}
+
+
+	Signals::Signals ()
+	{
 	}
 
 	Signals::~Signals ()
@@ -51,35 +341,51 @@ namespace Beeps
 	{
 		Signals t;
 		if (self->frames)
-			t.self->frames.reset(new stk::StkFrames(*self->frames));
+			t.self->frames.reset(new Frames(*self->frames));
+		t.self->nsamples = self->nsamples;
 		return t;
 	}
 
-	float
-	Signals::seconds () const
+	double
+	Signals::sample_rate () const
 	{
-		double sec = samples() / (double) sampling_rate();
-		return (float) sec;
+		return self->frames ? self->frames->dataRate() : Beeps::sample_rate();
 	}
 
 	uint
-	Signals::samples () const
+	Signals::nchannels () const
 	{
-		Data* p = self.get();
-		return p ? p->frames->frames() : 0;
+		return self->frames ? self->frames->nchannels() : 0;
 	}
 
 	uint
-	Signals::channels () const
+	Signals::nsamples () const
+	{
+		return self->nsamples;
+	}
+
+	uint
+	Signals::capacity () const
+	{
+		return self->frames ? self->frames->nframes() : 0;
+	}
+
+	bool
+	Signals::empty () const
+	{
+		return self->nsamples == 0;
+	}
+
+	const double*
+	Signals::samples () const
 	{
-		Data* p = self.get();
-		return p ? p->frames->channels() : 0;
+		return self->frames ? self->frames->data() : NULL;
 	}
 
 	Signals::operator bool () const
 	{
-		const stk::StkFrames* f = Signals_get_frames(this);
-		return f && f->frames() > 0 && f->channels() > 0;
+		const Frames* f = self->frames.get();
+		return f && f->dataRate() > 0 && f->nchannels() > 0 && f->nframes() > 0;
 	}
 
 	bool

data/src/signals.h

@@ -4,17 +4,207 @@
 #define __BEEPS_SRC_SIGNALS_H__
 
 
+#include <vector>
 #include <Stk.h>
+#include <xot/pimpl.h>
 #include <beeps/signals.h>
+#include <beeps/exception.h>
 
 
 namespace Beeps
 {
 
 
-	      stk::StkFrames* Signals_get_frames (      Signals* signals);
+	typedef stk::StkFloat Float;
 
-	const stk::StkFrames* Signals_get_frames (const Signals* signals);
+
+	class Frames;
+
+	template <typename T> class SignalSamples;
+
+
+	      Frames* Signals_get_frames (      Signals* signals);
+
+	const Frames* Signals_get_frames (const Signals* signals);
+
+	Signals Signals_create (
+		uint capacity, uint nchannels = 1, double sample_rate = 0);
+
+	Signals Signals_create (
+		const float* const* channels,
+		uint nsamples, uint nchannels, double sample_rate = 0);
+
+	void Signals_resize (Signals* signals, uint capacity);
+
+	void Signals_resize (Signals* signals, uint nsamples, Float value);
+
+	void Signals_clear (Signals* signals);
+
+	uint Signals_copy (Signals* to, const Signals& from, uint from_offset);
+
+	void Signals_apply (Signals* signals, const Signals& multiplier);
+
+	template <typename T>
+	void Signals_write_samples (
+		Signals* signals, const SignalSamples<T>& samples, long nsamples = -1);
+
+	void  Signals_set_nsamples (Signals* signals, uint nsamples);
+
+	float Signals_get_seconds (const Signals& signals);
+
+	void    Signals_save (const Signals& signals, const char* path);
+
+	Signals Signals_load (const char* path);
+
+
+	class Frames : public stk::StkFrames
+	{
+
+		public:
+
+			Frames (unsigned int nFrames = 0, unsigned int nChannels = 0)
+			:	stk::StkFrames(nFrames, nChannels)
+			{
+			}
+
+			size_t slice (size_t start, size_t length)
+			{
+				assert(!saved_data_);
+
+				size_t end = start + length;
+				assert(start <= nFrames_ && end <= nFrames_);
+
+				saved_data_       = data_;
+				saved_nFrames_    = nFrames_;
+				saved_size_       = size_;
+				saved_bufferSize_ = bufferSize_;
+
+				data_      += start * nChannels_;
+				nFrames_    = length;
+				size_       = length * nChannels_;
+				bufferSize_ = size_;
+
+				return end;
+			}
+
+			void unslice ()
+			{
+				assert(saved_data_);
+
+				data_       = saved_data_;
+				nFrames_    = saved_nFrames_;
+				size_       = saved_size_;
+				bufferSize_ = saved_bufferSize_;
+			}
+
+			uint nchannels () const
+			{
+				return nChannels_;
+			}
+
+			uint nframes () const
+			{
+				return nFrames_;
+			}
+
+			const Float* data () const
+			{
+				return data_;
+			}
+
+		private:
+
+			Float* saved_data_ = NULL;
+
+			size_t saved_nFrames_ = 0, saved_size_ = 0, saved_bufferSize_ = 0;
+
+	};// Frames
+
+
+	template <typename T>
+	class SignalSamples
+	{
+
+		typedef SignalSamples<T> This;
+
+		public:
+
+			SignalSamples (uint nsamples, uint nchannels)
+			{
+				self->nsamples = nsamples;
+				self->samples.resize(nsamples * nchannels, 0);
+				self->update_channels(nchannels);
+			}
+
+			SignalSamples (const Signals& signals)
+			{
+				if (!signals)
+					argument_error(__FILE__, __LINE__);
+
+				const Frames* f = Signals_get_frames(&signals);
+				assert(f);
+
+				uint nsamples  = signals.nsamples();
+				uint nchannels = signals.nchannels();
+
+				auto& samples = self->samples;
+				samples.reserve(nsamples * nchannels);
+
+				for (uint channel = 0; channel < nchannels; ++channel)
+				{
+					for (uint sample = 0; sample < nsamples; ++sample)
+						samples.push_back((*f)(sample, channel));
+				}
+
+				self->nsamples = nsamples;
+				self->update_channels(nchannels);
+			}
+
+			uint nchannels () const
+			{
+				return (uint) self->channels.size();
+			}
+
+			uint nsamples () const
+			{
+				return self->nsamples;
+			}
+
+			      T* const* channels () {return &self->channels[0];}
+
+			const T* const* channels () const
+			{
+				return const_cast<This*>(this)->channels();
+			}
+
+			      T* channel (uint index) {return self->channels[index];}
+
+			const T* channel (uint index) const
+			{
+				return const_cast<This*>(this)->channel(index);
+			}
+
+			struct Data
+			{
+
+				uint nsamples = 0;
+
+				std::vector<T> samples;
+
+				std::vector<T*> channels;
+
+				void update_channels (uint nchannels)
+				{
+					channels.clear();
+					for (uint i = 0; i < nchannels; ++i)
+						channels.push_back(&samples[nsamples * i]);
+				}
+
+			};// Data
+
+			Xot::PSharedImpl<Data> self;
+
+	};// SignalSamples
 
 
 }// Beeps