[base, synthesis] Allow synth size to be independent from frame size. Call synth_frame from Cython Synthesis.synth

so that derived classes synth_frame methods are
called.

6 files changed, 42 insertions, 25 deletions

diff --git a/simpl/base.pxd b/simpl/base.pxd
index 4f45332..075b1f0 100644
--- a/simpl/base.pxd
+++ b/simpl/base.pxd
@@ -61,6 +61,8 @@ cdef extern from "../src/simpl/base.h" namespace "simpl":
         # audio buffers
         int size()
         void size(int new_size)
+        int synth_size()
+        void synth_size(int new_size)
         void audio(double* new_audio)
         double* audio()
         void synth(double* new_synth)
diff --git a/simpl/base.pyx b/simpl/base.pyx
index d19b477..581d108 100644
--- a/simpl/base.pyx
+++ b/simpl/base.pyx
@@ -35,15 +35,12 @@ cdef class Peak:
 
 
 cdef class Frame:
-    def __cinit__(self, size=None, create_new=True, alloc_memory=False):
+    def __cinit__(self, size=2048, create_new=True):
         self._peaks = []
         self._partials = []
 
         if create_new:
-            if size:
-                self.thisptr = new c_Frame(size, alloc_memory)
-            else:
-                self.thisptr = new c_Frame()
+            self.thisptr = new c_Frame(size, True)
             self.created = True
         else:
             self.created = False
@@ -115,6 +112,10 @@ cdef class Frame:
         def __get__(self): return self.thisptr.size()
         def __set__(self, int i): self.thisptr.size(i)
 
+    property synth_size:
+        def __get__(self): return self.thisptr.synth_size()
+        def __set__(self, int i): self.thisptr.synth_size(i)
+
     property audio:
         def __get__(self):
             cdef np.npy_intp shape[1]
@@ -126,7 +127,7 @@ cdef class Frame:
     property synth:
         def __get__(self):
             cdef np.npy_intp shape[1]
-            shape[0] = <np.npy_intp> self.thisptr.size()
+            shape[0] = <np.npy_intp> self.thisptr.synth_size()
             return np.PyArray_SimpleNewFromData(1, shape, np.NPY_DOUBLE, self.thisptr.synth())
         def __set__(self, np.ndarray[dtype_t, ndim=1] a):
             self.thisptr.synth(<double*> a.data)
@@ -142,7 +143,7 @@ cdef class Frame:
     property synth_residual:
         def __get__(self):
             cdef np.npy_intp shape[1]
-            shape[0] = <np.npy_intp> self.thisptr.size()
+            shape[0] = <np.npy_intp> self.thisptr.synth_size()
             return np.PyArray_SimpleNewFromData(1, shape, np.NPY_DOUBLE, self.thisptr.synth_residual())
         def __set__(self, np.ndarray[dtype_t, ndim=1] a):
             self.thisptr.synth_residual(<double*> a.data)
diff --git a/simpl/synthesis.pyx b/simpl/synthesis.pyx
index ad23fa8..33f98ce 100644
--- a/simpl/synthesis.pyx
+++ b/simpl/synthesis.pyx
@@ -40,18 +40,12 @@ cdef class Synthesis:
         return frame.audio
 
     def synth(self, frames):
-        cdef vector[c_Frame*] c_frames
-        for frame in frames:
-            c_frames.push_back((<Frame>frame).thisptr)
-        cdef vector[c_Frame*] output_frames = self.thisptr.synth(c_frames)
-        cdef np.ndarray[dtype_t, ndim=1] output = np.zeros(
-            output_frames.size() * self.thisptr.hop_size()
-        )
-        cdef np.npy_intp shape[1]
-        shape[0] = <np.npy_intp> self.thisptr.hop_size()
-        for i in range(output_frames.size()):
-            frame_audio = np.PyArray_SimpleNewFromData(1, shape, np.NPY_DOUBLE, output_frames[i].synth())
-            output[i * self.thisptr.hop_size():(i + 1) * self.thisptr.hop_size()] = frame_audio
+        cdef int size = self.thisptr.hop_size()
+        cdef np.ndarray[dtype_t, ndim=1] output = np.zeros(len(frames) * size)
+        for i in range(len(frames)):
+            frames[i].synth = np.zeros(size)
+            self.synth_frame(frames[i])
+            output[i * size:(i + 1) * size] = frames[i].synth
         return output
 
 
diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index e3da251..c3c8ea5 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -81,12 +81,14 @@ Peak* Partial::peak(int peak_number) {
 // ---------------------------------------------------------------------------
 Frame::Frame() {
     _size = 512;
+    _synth_size = 512;
     _alloc_memory = false;
     init();
 }
 
 Frame::Frame(int frame_size, bool alloc_memory) {
     _size = frame_size;
+    _synth_size = 512;
     _alloc_memory = alloc_memory;
     init();
 
@@ -119,14 +121,14 @@ void Frame::init() {
 
 void Frame::create_arrays() {
     _audio = new sample[_size];
-    _synth = new sample[_size];
+    _synth = new sample[_synth_size];
     _residual = new sample[_size];
-    _synth_residual = new sample[_size];
+    _synth_residual = new sample[_synth_size];
 
     memset(_audio, 0.0, sizeof(sample) * _size);
-    memset(_synth, 0.0, sizeof(sample) * _size);
+    memset(_synth, 0.0, sizeof(sample) * _synth_size);
     memset(_residual, 0.0, sizeof(sample) * _size);
-    memset(_synth_residual, 0.0, sizeof(sample) * _size);
+    memset(_synth_residual, 0.0, sizeof(sample) * _synth_size);
 }
 
 void Frame::destroy_arrays() {
@@ -235,6 +237,19 @@ void Frame::size(int new_size) {
     }
 }
 
+int Frame::synth_size() {
+    return _synth_size;
+}
+
+void Frame::synth_size(int new_size) {
+    _synth_size = new_size;
+
+    if(_alloc_memory) {
+        destroy_arrays();
+        create_arrays();
+    }
+}
+
 void Frame::audio(sample* new_audio) {
     if(_alloc_memory) {
         memcpy(_audio, new_audio, sizeof(sample) * _size);
@@ -250,7 +265,7 @@ sample* Frame::audio() {
 
 void Frame::synth(sample* new_synth) {
     if(_alloc_memory) {
-        memcpy(_synth, new_synth, sizeof(sample) * _size);
+        memcpy(_synth, new_synth, sizeof(sample) * _synth_size);
     }
     else {
         _synth = new_synth;
@@ -276,7 +291,7 @@ sample* Frame::residual() {
 
 void Frame::synth_residual(sample* new_synth_residual) {
     if(_alloc_memory) {
-        memcpy(_synth_residual, new_synth_residual, sizeof(sample) * _size);
+        memcpy(_synth_residual, new_synth_residual, sizeof(sample) * _synth_size);
     }
     else {
         _synth_residual = new_synth_residual;
diff --git a/src/simpl/base.h b/src/simpl/base.h
index 7c19f77..bedd7e2 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -79,6 +79,7 @@ typedef std::vector<Partial*> Partials;
 class Frame {
     private:
         int _size;
+        int _synth_size;
         int _max_peaks;
         int _num_peaks;
         int _max_partials;
@@ -121,6 +122,8 @@ class Frame {
         // audio buffers
         int size();
         void size(int new_size);
+        int synth_size();
+        void synth_size(int new_size);
         void audio(sample* new_audio);
         sample* audio();
         void synth(sample* new_synth);
diff --git a/tests/test_base.py b/tests/test_base.py
index 6cd2d39..1a231f5 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -15,7 +15,9 @@ class TestFrame(object):
     def test_buffers(self):
         N = 256
         f = base.Frame(N)
+        f.synth_size = N
         assert f.size == N
+        assert f.synth_size == N
 
         a = np.random.rand(N)
         f.audio = a