summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt3
-rw-r--r--simpl/__init__.py1
-rw-r--r--simpl/synthesis.pxd5
-rw-r--r--simpl/synthesis.pyx16
-rw-r--r--src/simpl/synthesis.cpp53
-rw-r--r--src/simpl/synthesis.h23
-rw-r--r--tests/test_synthesis.cpp77
7 files changed, 177 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1a79a5e..cdc6d0e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,13 +43,16 @@ install(FILES ${include_files} DESTINATION include/simpl)
set(test_base_src ${source_files} tests/test_base.cpp)
set(test_peak_detection_src ${source_files} tests/test_peak_detection.cpp)
set(test_partial_tracking_src ${source_files} tests/test_partial_tracking.cpp)
+set(test_synthesis_src ${source_files} tests/test_synthesis.cpp)
LIST(APPEND libs cppunit sndfile)
add_executable(test_base ${test_base_src})
add_executable(test_peak_detection ${test_peak_detection_src})
add_executable(test_partial_tracking ${test_partial_tracking_src})
+add_executable(test_synthesis ${test_synthesis_src})
target_link_libraries(test_base ${libs})
target_link_libraries(test_peak_detection ${libs})
target_link_libraries(test_partial_tracking ${libs})
+target_link_libraries(test_synthesis ${libs})
diff --git a/simpl/__init__.py b/simpl/__init__.py
index 798e31b..80a7ad8 100644
--- a/simpl/__init__.py
+++ b/simpl/__init__.py
@@ -29,6 +29,7 @@ LorisPartialTracking = partial_tracking.LorisPartialTracking
Synthesis = synthesis.Synthesis
SMSSynthesis = synthesis.SMSSynthesis
SndObjSynthesis = synthesis.SndObjSynthesis
+LorisSynthesis = synthesis.LorisSynthesis
Residual = residual.Residual
SMSResidual = residual.SMSResidual
diff --git a/simpl/synthesis.pxd b/simpl/synthesis.pxd
index 35d17eb..6e87fe1 100644
--- a/simpl/synthesis.pxd
+++ b/simpl/synthesis.pxd
@@ -34,3 +34,8 @@ cdef extern from "../src/simpl/synthesis.h" namespace "simpl":
cdef cppclass c_SndObjSynthesis "simpl::SndObjSynthesis"(c_Synthesis):
c_SndObjSynthesis()
+
+ cdef cppclass c_LorisSynthesis "simpl::LorisSynthesis"(c_Synthesis):
+ c_LorisSynthesis()
+ double bandwidth()
+ void bandwidth(double new_bandwidth)
diff --git a/simpl/synthesis.pyx b/simpl/synthesis.pyx
index a6f7737..8e4a050 100644
--- a/simpl/synthesis.pyx
+++ b/simpl/synthesis.pyx
@@ -86,3 +86,19 @@ cdef class SndObjSynthesis(Synthesis):
if self.thisptr:
del self.thisptr
self.thisptr = <c_Synthesis*>0
+
+
+cdef class LorisSynthesis(Synthesis):
+ def __cinit__(self):
+ if self.thisptr:
+ del self.thisptr
+ self.thisptr = new c_LorisSynthesis()
+
+ def __dealloc__(self):
+ if self.thisptr:
+ del self.thisptr
+ self.thisptr = <c_Synthesis*>0
+
+ property bandwidth:
+ def __get__(self): return (<c_LorisSynthesis*>self.thisptr).bandwidth()
+ def __set__(self, double d): (<c_LorisSynthesis*>self.thisptr).bandwidth(d)
diff --git a/src/simpl/synthesis.cpp b/src/simpl/synthesis.cpp
index 25312cc..5784522 100644
--- a/src/simpl/synthesis.cpp
+++ b/src/simpl/synthesis.cpp
@@ -254,7 +254,58 @@ void SndObjSynthesis::synth_frame(Frame* frame) {
_synth->DoProcess();
- for(int i = 0; i < _hop_size; i++) {
+ for(int i = 0; i < _frame_size; i++) {
frame->synth()[i] = _synth->Output(i);
}
}
+
+
+// ---------------------------------------------------------------------------
+// LorisSynthesis
+// ---------------------------------------------------------------------------
+LorisSynthesis::LorisSynthesis() {
+ _bandwidth = 1.0;
+ reset();
+}
+
+LorisSynthesis::~LorisSynthesis() {
+}
+
+void LorisSynthesis::reset() {
+ _oscs.clear();
+ _oscs.resize(_max_partials);
+ for(int i = 0; i < _max_partials; i++) {
+ _oscs.push_back(Loris::Oscillator());
+ }
+}
+
+void LorisSynthesis::max_partials(int new_max_partials) {
+ _max_partials = new_max_partials;
+ reset();
+}
+
+sample LorisSynthesis::bandwidth() {
+ return _bandwidth;
+}
+
+void LorisSynthesis::bandwidth(sample new_bandwidth) {
+ _bandwidth = new_bandwidth;
+}
+
+void LorisSynthesis::synth_frame(Frame* frame) {
+ int num_partials = frame->num_partials();
+ if(num_partials > _max_partials) {
+ num_partials = _max_partials;
+ }
+
+ for(int i = 0; i < num_partials; i++) {
+ Loris::Breakpoint bp = Loris::Breakpoint(
+ frame->partial(i)->frequency,
+ frame->partial(i)->amplitude,
+ frame->partial(i)->bandwidth * _bandwidth,
+ frame->partial(i)->phase
+ );
+ _oscs[i].oscillate(frame->synth(), frame->synth() + _hop_size,
+ bp, _sampling_rate);
+ }
+}
diff --git a/src/simpl/synthesis.h b/src/simpl/synthesis.h
index 456b4e4..e93669f 100644
--- a/src/simpl/synthesis.h
+++ b/src/simpl/synthesis.h
@@ -12,6 +12,9 @@ extern "C" {
#include "SinAnal.h"
#include "AdSyn.h"
+#include "Breakpoint.h"
+#include "Oscillator.h"
+
using namespace std;
namespace simpl
@@ -92,11 +95,31 @@ class SndObjSynthesis : public Synthesis {
public:
SndObjSynthesis();
~SndObjSynthesis();
+ void frame_size(int new_frame_size);
void hop_size(int new_hop_size);
void max_partials(int new_max_partials);
void synth_frame(Frame* frame);
};
+
+// ---------------------------------------------------------------------------
+// LorisSynthesis
+// ---------------------------------------------------------------------------
+class LorisSynthesis : public Synthesis {
+ private:
+ std::vector<Loris::Oscillator> _oscs;
+ sample _bandwidth;
+ void reset();
+
+ public:
+ LorisSynthesis();
+ ~LorisSynthesis();
+ void max_partials(int new_max_partials);
+ sample bandwidth();
+ void bandwidth(sample new_bandwidth);
+ void synth_frame(Frame* frame);
+};
+
} // end of namespace Simpl
#endif
diff --git a/tests/test_synthesis.cpp b/tests/test_synthesis.cpp
new file mode 100644
index 0000000..f4d215d
--- /dev/null
+++ b/tests/test_synthesis.cpp
@@ -0,0 +1,77 @@
+#include <iostream>
+#include <cppunit/ui/text/TextTestRunner.h>
+#include <cppunit/TestResult.h>
+#include <cppunit/TestResultCollector.h>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/BriefTestProgressListener.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <sndfile.hh>
+
+#include "../src/simpl/base.h"
+#include "../src/simpl/peak_detection.h"
+#include "../src/simpl/partial_tracking.h"
+#include "../src/simpl/synthesis.h"
+
+namespace simpl
+{
+
+// ---------------------------------------------------------------------------
+// TestLorisSynthesis
+// ---------------------------------------------------------------------------
+class TestLorisSynthesis : public CPPUNIT_NS::TestCase {
+ CPPUNIT_TEST_SUITE(TestLorisSynthesis);
+ CPPUNIT_TEST(test_basic);
+ CPPUNIT_TEST_SUITE_END();
+
+protected:
+ static const double PRECISION = 0.001;
+ LorisPeakDetection* pd;
+ LorisPartialTracking* pt;
+ LorisSynthesis* 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 LorisPeakDetection();
+ pt = new LorisPartialTracking();
+ synth = new LorisSynthesis();
+ sf = SndfileHandle("../tests/audio/flute.wav");
+ num_samples = 4096;
+ }
+
+ void tearDown() {
+ delete pd;
+ delete pt;
+ delete synth;
+ }
+};
+
+} // end of namespace simpl
+
+CPPUNIT_TEST_SUITE_REGISTRATION(simpl::TestLorisSynthesis);
+
+int main(int arg, char **argv) {
+ CppUnit::TextTestRunner runner;
+ runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
+ return runner.run("", false);
+}
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 03:36:55 +0000