summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--simpl/base.pxd9
-rw-r--r--simpl/base.pyx9
-rw-r--r--simpl/partial_tracking.pxd2
-rw-r--r--simpl/partial_tracking.pyx10
-rw-r--r--simpl/peak_detection.pxd10
-rw-r--r--simpl/peak_detection.pyx10
-rw-r--r--src/simpl/base.cpp41
-rw-r--r--src/simpl/base.h8
-rw-r--r--tests/test_base.py4
9 files changed, 48 insertions, 55 deletions
diff --git a/simpl/base.pxd b/simpl/base.pxd
index 87e9a78..563ac1f 100644
--- a/simpl/base.pxd
+++ b/simpl/base.pxd
@@ -51,7 +51,8 @@ cdef extern from "../src/simpl/base.h" namespace "simpl":
int max_peaks()
void max_peaks(int new_max_peaks)
c_Peak* peak(int peak_number)
- void add_peak(c_Peak* peak)
+ void add_peak(double amplitude, double frequency,
+ double phase, double bandwidth)
void clear_peaks()
# partials
@@ -59,9 +60,11 @@ cdef extern from "../src/simpl/base.h" namespace "simpl":
void num_partials(int new_num_partials)
int max_partials()
void max_partials(int new_max_partials)
- void add_partial(c_Peak* peak)
+ void add_partial(double amplitude, double frequency,
+ double phase, double bandwidth)
c_Peak* partial(int partial_number)
- void partial(int partial_number, c_Peak* peak)
+ void partial(int partial_number, double amplitude, double frequency,
+ double phase, double bandwidth)
void clear_partials()
# audio buffers
diff --git a/simpl/base.pyx b/simpl/base.pyx
index ad63fdb..ed72475 100644
--- a/simpl/base.pyx
+++ b/simpl/base.pyx
@@ -69,7 +69,8 @@ cdef class Frame:
def __set__(self, int i): self.thisptr.max_peaks(i)
def add_peak(self, Peak p not None):
- self.thisptr.add_peak(p.thisptr)
+ self.thisptr.add_peak(p.amplitude, p.frequency,
+ p.phase, p.bandwidth)
def add_peaks(self, peaks not None):
for p in peaks:
@@ -115,7 +116,8 @@ cdef class Frame:
def __set__(self, int i): self.thisptr.max_partials(i)
def add_partial(self, Peak p not None):
- self.thisptr.add_partial(p.thisptr)
+ self.thisptr.add_partial(p.amplitude, p.frequency,
+ p.phase, p.bandwidth)
def add_partials(self, peaks not None):
for p in peaks:
@@ -139,7 +141,8 @@ cdef class Frame:
peak.copy(c_p)
return peak
else:
- self.thisptr.partial(i, p.thisptr)
+ self.thisptr.partial(i, p.amplitude, p.frequency,
+ p.phase, p.bandwidth)
property partials:
def __get__(self):
diff --git a/simpl/partial_tracking.pxd b/simpl/partial_tracking.pxd
index 3c49296..3f8e9a6 100644
--- a/simpl/partial_tracking.pxd
+++ b/simpl/partial_tracking.pxd
@@ -23,7 +23,7 @@ cdef extern from "../src/simpl/partial_tracking.h" namespace "simpl":
void min_partial_length(int new_min_partial_length)
int max_gap()
void max_gap(int new_max_gap)
- vector[c_Peak*] update_partials(c_Frame* frame)
+ void update_partials(c_Frame* frame)
vector[c_Frame*] find_partials(vector[c_Frame*] frames)
cdef cppclass c_MQPartialTracking "simpl::MQPartialTracking"(c_PartialTracking):
diff --git a/simpl/partial_tracking.pyx b/simpl/partial_tracking.pyx
index 8dd6e79..5251b4c 100644
--- a/simpl/partial_tracking.pyx
+++ b/simpl/partial_tracking.pyx
@@ -40,14 +40,8 @@ cdef class PartialTracking:
def __set__(self, int i): self.thisptr.max_gap(i)
def update_partials(self, Frame frame not None):
- peaks = []
- cdef vector[c_Peak*] c_peaks = self.thisptr.update_partials(frame.thisptr)
- for i in range(c_peaks.size()):
- peak = Peak(False)
- peak.set_peak(c_peaks[i])
- peaks.append(peak)
- frame.partials = peaks
- return peaks
+ self.thisptr.update_partials(frame.thisptr)
+ return frame.partials
def find_partials(self, frames):
partial_frames = []
diff --git a/simpl/peak_detection.pxd b/simpl/peak_detection.pxd
index aeed77d..1300690 100644
--- a/simpl/peak_detection.pxd
+++ b/simpl/peak_detection.pxd
@@ -34,30 +34,30 @@ cdef extern from "../src/simpl/peak_detection.h" namespace "simpl":
int num_frames()
c_Frame* frame(int frame_number)
void frames(vector[c_Frame*] new_frames)
- vector[c_Peak*] find_peaks_in_frame(c_Frame* frame)
+ void find_peaks_in_frame(c_Frame* frame)
vector[c_Frame*] find_peaks(int audio_size, double* audio)
cdef cppclass c_MQPeakDetection "simpl::MQPeakDetection"(c_PeakDetection):
c_MQPeakDetection()
void hop_size(int new_hop_size)
void max_peaks(int new_max_peaks)
- vector[c_Peak*] find_peaks_in_frame(c_Frame* frame)
+ void find_peaks_in_frame(c_Frame* frame)
cdef cppclass c_SMSPeakDetection "simpl::SMSPeakDetection"(c_PeakDetection):
c_SMSPeakDetection()
void hop_size(int new_hop_size)
void max_peaks(int new_max_peaks)
- vector[c_Peak*] find_peaks_in_frame(c_Frame* frame)
+ void find_peaks_in_frame(c_Frame* frame)
vector[c_Frame*] find_peaks(int audio_size, double* audio)
cdef cppclass c_SndObjPeakDetection "simpl::SndObjPeakDetection"(c_PeakDetection):
c_SndObjPeakDetection()
void hop_size(int new_hop_size)
void max_peaks(int new_max_peaks)
- vector[c_Peak*] find_peaks_in_frame(c_Frame* frame)
+ void find_peaks_in_frame(c_Frame* frame)
cdef cppclass c_LorisPeakDetection "simpl::LorisPeakDetection"(c_PeakDetection):
c_LorisPeakDetection()
void hop_size(int new_hop_size)
void max_peaks(int new_max_peaks)
- vector[c_Peak*] find_peaks_in_frame(c_Frame* frame)
+ void find_peaks_in_frame(c_Frame* frame)
diff --git a/simpl/peak_detection.pyx b/simpl/peak_detection.pyx
index a5c680f..4826c60 100644
--- a/simpl/peak_detection.pyx
+++ b/simpl/peak_detection.pyx
@@ -66,14 +66,8 @@ cdef class PeakDetection:
return f
def find_peaks_in_frame(self, Frame frame not None):
- peaks = []
- cdef vector[c_Peak*] c_peaks = self.thisptr.find_peaks_in_frame(frame.thisptr)
- for i in range(c_peaks.size()):
- peak = Peak(False)
- peak.set_peak(c_peaks[i])
- peaks.append(peak)
- frame.peaks = peaks
- return peaks
+ self.thisptr.find_peaks_in_frame(frame.thisptr)
+ return frame.peaks
def find_peaks(self, np.ndarray[dtype_t, ndim=1] audio):
self.frames = []
diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index 6671b53..8b9d339 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -223,7 +223,8 @@ void Frame::max_peaks(int new_max_peaks) {
resize_peaks(_max_peaks);
}
-void Frame::add_peak(Peak* peak) {
+void Frame::add_peak(sample amplitude, sample frequency,
+ sample phase, sample bandwidth) {
if(_num_peaks >= _max_peaks) {
printf("Warning: attempted to add more than the specified"
" maximum number of peaks (%d) to a frame, ignoring.\n",
@@ -231,15 +232,6 @@ void Frame::add_peak(Peak* peak) {
return;
}
- if(_peaks[_num_peaks]) {
- delete _peaks[_num_peaks];
- }
- _peaks[_num_peaks] = peak;
- _num_peaks++;
-}
-
-void Frame::add_peak(sample amplitude, sample frequency,
- sample phase, sample bandwidth) {
_peaks[_num_peaks]->amplitude = amplitude;
_peaks[_num_peaks]->frequency = frequency;
_peaks[_num_peaks]->phase = phase;
@@ -251,8 +243,12 @@ Peak* Frame::peak(int peak_number) {
return _peaks[peak_number];
}
-void Frame::peak(int peak_number, Peak* peak) {
- _peaks[peak_number] = peak;
+void Frame::peak(int peak_number, sample amplitude, sample frequency,
+ sample phase, sample bandwidth) {
+ _peaks[peak_number]->amplitude = amplitude;
+ _peaks[peak_number]->frequency = frequency;
+ _peaks[peak_number]->phase = phase;
+ _peaks[peak_number]->bandwidth = bandwidth;
}
// Frame - partials
@@ -282,7 +278,8 @@ void Frame::max_partials(int new_max_partials) {
resize_partials(_max_partials);
}
-void Frame::add_partial(Peak* peak) {
+void Frame::add_partial(sample amplitude, sample frequency,
+ sample phase, sample bandwidth) {
if(_num_partials >= _max_partials) {
printf("Warning: attempted to add more than the specified"
" maximum number of partials (%d) to a frame, ignoring.\n",
@@ -290,12 +287,6 @@ void Frame::add_partial(Peak* peak) {
return;
}
- _partials[_num_partials] = peak;
- _num_partials++;
-}
-
-void Frame::add_partial(sample amplitude, sample frequency,
- sample phase, sample bandwidth) {
_partials[_num_partials]->amplitude = amplitude;
_partials[_num_partials]->frequency = frequency;
_partials[_num_partials]->phase = phase;
@@ -307,8 +298,12 @@ Peak* Frame::partial(int partial_number) {
return _partials[partial_number];
}
-void Frame::partial(int partial_number, Peak* peak) {
- _partials[partial_number] = peak;
+void Frame::partial(int partial_number, sample amplitude, sample frequency,
+ sample phase, sample bandwidth) {
+ _partials[partial_number]->amplitude = amplitude;
+ _partials[partial_number]->frequency = frequency;
+ _partials[partial_number]->phase = phase;
+ _partials[partial_number]->bandwidth = bandwidth;
}
@@ -343,7 +338,7 @@ void Frame::synth_size(int new_size) {
void Frame::audio(sample* new_audio) {
if(_alloc_memory) {
- memcpy(_audio, new_audio, sizeof(sample) * _size);
+ std::copy(new_audio, new_audio + _size, _audio);
}
else {
_audio = new_audio;
@@ -377,7 +372,7 @@ sample* Frame::audio() {
void Frame::synth(sample* new_synth) {
if(_alloc_memory) {
- memcpy(_synth, new_synth, sizeof(sample) * _synth_size);
+ std::copy(new_synth, new_synth + _synth_size, _synth);
}
else {
_synth = new_synth;
diff --git a/src/simpl/base.h b/src/simpl/base.h
index 483912c..221e028 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -85,22 +85,22 @@ class Frame {
void num_peaks(int new_num_peaks);
int max_peaks();
void max_peaks(int new_max_peaks);
- void add_peak(Peak* peak);
void add_peak(sample amplitude, sample frequency,
sample phase, sample bandwidth);
Peak* peak(int peak_number);
- void peak(int peak_number, Peak* peak);
+ void peak(int peak_number, sample amplitude, sample frequency,
+ sample phase, sample bandwidth);
// partials
int num_partials();
void num_partials(int new_num_partials);
int max_partials();
void max_partials(int new_max_partials);
- void add_partial(Peak* peak);
void add_partial(sample amplitude, sample frequency,
sample phase, sample bandwidth);
Peak* partial(int partial_number);
- void partial(int partial_number, Peak* peak);
+ void partial(int partial_number, sample amplitude, sample frequency,
+ sample phase, sample bandwidth);
// audio buffers
int size();
diff --git a/tests/test_base.py b/tests/test_base.py
index 1a231f5..667d928 100644
--- a/tests/test_base.py
+++ b/tests/test_base.py
@@ -48,6 +48,10 @@ class TestFrame(object):
assert_almost_equals(f.peaks[0].amplitude, p.amplitude,
float_precision)
+ assert_almost_equals(f.peaks[0].frequency, p.frequency,
+ float_precision)
+ assert_almost_equals(f.peaks[0].phase, p.phase,
+ float_precision)
f.clear()
assert len(f.peaks) == 0
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 03:12:41 +0000