summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--simpl/synthesis.pxd3
-rw-r--r--simpl/synthesis.pyx12
-rw-r--r--src/simpl/synthesis.cpp109
-rw-r--r--src/simpl/synthesis.h21
-rw-r--r--tests/test_synthesis.cpp52
5 files changed, 197 insertions, 0 deletions
diff --git a/simpl/synthesis.pxd b/simpl/synthesis.pxd
index 6e87fe1..201a545 100644
--- a/simpl/synthesis.pxd
+++ b/simpl/synthesis.pxd
@@ -25,6 +25,9 @@ cdef extern from "../src/simpl/synthesis.h" namespace "simpl":
void synth_frame(c_Frame* frame)
vector[c_Frame*] synth(vector[c_Frame*] frames)
+ cdef cppclass c_MQSynthesis "simpl::MQSynthesis"(c_Synthesis):
+ c_MQSynthesis()
+
cdef cppclass c_SMSSynthesis "simpl::SMSSynthesis"(c_Synthesis):
c_SMSSynthesis()
int num_stochastic_coeffs()
diff --git a/simpl/synthesis.pyx b/simpl/synthesis.pyx
index 708c210..b86a7c0 100644
--- a/simpl/synthesis.pyx
+++ b/simpl/synthesis.pyx
@@ -50,6 +50,18 @@ cdef class Synthesis:
return output
+cdef class MQSynthesis(Synthesis):
+ def __cinit__(self):
+ if self.thisptr:
+ del self.thisptr
+ self.thisptr = new c_MQSynthesis()
+
+ def __dealloc__(self):
+ if self.thisptr:
+ del self.thisptr
+ self.thisptr = <c_Synthesis*>0
+
+
cdef class SMSSynthesis(Synthesis):
SMS_DET_IFFT = 0
SMS_DET_SIN = 1
diff --git a/src/simpl/synthesis.cpp b/src/simpl/synthesis.cpp
index 3f48c78..c5d3570 100644
--- a/src/simpl/synthesis.cpp
+++ b/src/simpl/synthesis.cpp
@@ -59,6 +59,115 @@ Frames Synthesis::synth(Frames frames) {
// ---------------------------------------------------------------------------
+// MQSynthesis
+// ---------------------------------------------------------------------------
+MQSynthesis::MQSynthesis() {
+ _prev_amps = NULL;
+ _prev_freqs = NULL;
+ _prev_phases = NULL;
+ reset();
+}
+
+MQSynthesis::~MQSynthesis() {
+ if(_prev_amps) delete [] _prev_amps;
+ if(_prev_freqs) delete [] _prev_freqs;
+ if(_prev_phases) delete [] _prev_phases;
+
+ _prev_amps = NULL;
+ _prev_freqs = NULL;
+ _prev_phases = NULL;
+}
+
+void MQSynthesis::reset() {
+ if(_prev_amps) delete [] _prev_amps;
+ if(_prev_freqs) delete [] _prev_freqs;
+ if(_prev_phases) delete [] _prev_phases;
+
+ _prev_amps = new sample[_max_partials];
+ _prev_freqs = new sample[_max_partials];
+ _prev_phases = new sample[_max_partials];
+
+ memset(_prev_amps, 0.0, sizeof(sample) * _max_partials);
+ memset(_prev_freqs, 0.0, sizeof(sample) * _max_partials);
+ memset(_prev_phases, 0.0, sizeof(sample) * _max_partials);
+}
+
+sample MQSynthesis::hz_to_radians(sample f) {
+ return (f * 2 * M_PI) / _sampling_rate;
+}
+
+void MQSynthesis::max_partials(int new_max_partials) {
+ _max_partials = new_max_partials;
+ reset();
+}
+
+void MQSynthesis::synth_frame(Frame* frame) {
+ int num_partials = frame->num_partials();
+ if(num_partials > _max_partials) {
+ num_partials = _max_partials;
+ }
+
+ for(int n = 0; n < _hop_size; n++) {
+ frame->synth()[n] = 0.f;
+ }
+
+ for(int i = 0; i < num_partials; i++) {
+ sample amp = frame->partial(i)->amplitude;
+ sample freq = hz_to_radians(frame->partial(i)->frequency);
+ sample phase = frame->partial(i)->phase;
+
+ // get values for last amplitude, frequency and phase
+ // these are the initial values of the instantaneous
+ // amplitude/frequency/phase
+ sample prev_amp = _prev_amps[i];
+ sample prev_freq = _prev_freqs[i];
+ sample prev_phase = _prev_phases[i];
+
+ if(prev_amp == 0) {
+ prev_freq = freq;
+ prev_phase = frame->partial(i)->phase - (freq * _hop_size);
+ while(prev_phase >= M_PI) {
+ prev_phase -= (2.0 * M_PI);
+ }
+ while(prev_phase < -M_PI) {
+ prev_phase += (2.0 * M_PI);
+ }
+ }
+
+ // amplitudes are linearly interpolated between frames
+ sample inst_amp = prev_amp;
+ sample amp_inc = (frame->partial(i)->amplitude - prev_amp) / _hop_size;
+
+ // freqs/phases are calculated by cubic interpolation
+ sample freq_diff = freq - prev_freq;
+ sample x = (prev_phase + (prev_freq * _hop_size) - phase) +
+ (freq_diff * (_hop_size / 2.0));
+ x /= (2.0 * M_PI);
+ int m = floor(x + 0.5);
+ sample phase_diff = phase - prev_phase - (prev_freq * _hop_size) +
+ (2.0 * M_PI * m);
+ sample alpha = ((3.0 / pow(_hop_size, 2.0)) * phase_diff) -
+ (freq_diff / _hop_size);
+ sample beta = ((-2.0 / pow(_hop_size, 3.0)) * phase_diff) +
+ (freq_diff / pow(_hop_size, 2.0));
+
+ // calculate output samples
+ sample inst_phase = 0.f;
+ for(int n = 0; n < _hop_size; n++) {
+ inst_amp += amp_inc;
+ inst_phase = prev_phase + (prev_freq * n) +
+ (alpha * pow((sample)n, 2.0)) +
+ (beta * pow((sample)n, 3.0));
+ frame->synth()[n] += (2.f * inst_amp) * cos(inst_phase);
+ }
+
+ _prev_amps[i] = amp;
+ _prev_freqs[i] = freq;
+ _prev_phases[i] = phase;
+ }
+}
+
+// ---------------------------------------------------------------------------
// SMSSynthesis
// ---------------------------------------------------------------------------
diff --git a/src/simpl/synthesis.h b/src/simpl/synthesis.h
index e93669f..64f6f7b 100644
--- a/src/simpl/synthesis.h
+++ b/src/simpl/synthesis.h
@@ -1,6 +1,8 @@
#ifndef SYNTHESIS_H
#define SYNTHESIS_H
+#include <math.h>
+
#include "base.h"
extern "C" {
@@ -51,6 +53,25 @@ class Synthesis {
// ---------------------------------------------------------------------------
+// MQSynthesis
+// ---------------------------------------------------------------------------
+class MQSynthesis : public Synthesis {
+ private:
+ sample* _prev_amps;
+ sample* _prev_freqs;
+ sample* _prev_phases;
+ void reset();
+ sample hz_to_radians(sample f);
+
+ public:
+ MQSynthesis();
+ ~MQSynthesis();
+ void max_partials(int new_max_partials);
+ void synth_frame(Frame* frame);
+};
+
+
+// ---------------------------------------------------------------------------
// SMSSynthesis
// ---------------------------------------------------------------------------
class SMSSynthesis : public Synthesis {
diff --git a/tests/test_synthesis.cpp b/tests/test_synthesis.cpp
index 50ca6ed..fa49016 100644
--- a/tests/test_synthesis.cpp
+++ b/tests/test_synthesis.cpp
@@ -16,6 +16,57 @@ namespace simpl
{
// ---------------------------------------------------------------------------
+// TestMQSynthesis
+// ---------------------------------------------------------------------------
+class TestMQSynthesis : public CPPUNIT_NS::TestCase {
+ CPPUNIT_TEST_SUITE(TestMQSynthesis);
+ CPPUNIT_TEST(test_basic);
+ CPPUNIT_TEST_SUITE_END();
+
+protected:
+ static const double PRECISION = 0.001;
+ MQPeakDetection* pd;
+ MQPartialTracking* pt;
+ MQSynthesis* synth;
+ SndfileHandle sf;
+ int num_samples;
+
+ void test_basic() {
+ sample* audio = new sample[(int)sf.frames()];
+ sf.read(audio, (int)sf.frames());
+ Frames frames = pd->find_peaks(num_samples, &(audio[(int)sf.frames() / 2]));
+ frames = pt->find_partials(frames);
+ frames = synth->synth(frames);
+
+ for(int i = 0; i < frames.size(); i++) {
+ CPPUNIT_ASSERT(frames[i]->num_peaks() > 0);
+ CPPUNIT_ASSERT(frames[i]->num_partials() > 0);
+
+ double energy = 0.f;
+ for(int j = 0; j < synth->hop_size(); j++) {
+ energy += frames[i]->synth()[j] * frames[i]->synth()[j];
+ }
+ CPPUNIT_ASSERT(energy > 0.f);
+ }
+ }
+
+public:
+ void setUp() {
+ pd = new MQPeakDetection();
+ pt = new MQPartialTracking();
+ synth = new MQSynthesis();
+ sf = SndfileHandle("../tests/audio/flute.wav");
+ num_samples = 4096;
+ }
+
+ void tearDown() {
+ delete pd;
+ delete pt;
+ delete synth;
+ }
+};
+
+// ---------------------------------------------------------------------------
// TestLorisSynthesis
// ---------------------------------------------------------------------------
class TestLorisSynthesis : public CPPUNIT_NS::TestCase {
@@ -72,6 +123,7 @@ public:
} // end of namespace simpl
+CPPUNIT_TEST_SUITE_REGISTRATION(simpl::TestMQSynthesis);
CPPUNIT_TEST_SUITE_REGISTRATION(simpl::TestLorisSynthesis);
int main(int arg, char **argv) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 09:45:58 +0000