[loris] LorisPeakDetection updates and fixes (save bandwidth to simpl Peak objects).

4 files changed, 23 insertions, 8 deletions

diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index c3c8ea5..2377c01 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -11,6 +11,7 @@ Peak::Peak() {
     amplitude = 0.0;
     frequency = 0.0;
     phase = 0.0;
+    bandwidth = 0.0;
     next_peak = NULL;
     previous_peak = NULL;
     partial_id = 0;
diff --git a/src/simpl/base.h b/src/simpl/base.h
index cbd1fbf..040e199 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -22,6 +22,7 @@ class Peak {
         sample amplitude;
         sample frequency;
         sample phase;
+        sample bandwidth;
         Peak* next_peak;
         Peak* previous_peak;
         int partial_id;
diff --git a/src/simpl/peak_detection.cpp b/src/simpl/peak_detection.cpp
index 09ce788..ff66278 100644
--- a/src/simpl/peak_detection.cpp
+++ b/src/simpl/peak_detection.cpp
@@ -144,7 +144,7 @@ Frames PeakDetection::find_peaks(int audio_size, sample* audio) {
 
         // get the next frame
         Frame* f = new Frame(_frame_size);
-        f->audio(&audio[pos]);
+        f->audio(&(audio[pos]));
         f->max_peaks(_max_peaks);
 
         // find peaks
@@ -414,12 +414,10 @@ void SimplLorisAnalyzer::analyze(int audio_size, sample* audio) {
     _spectrum->transform(audio, audio + (audio_size / 2), audio + audio_size);
     peaks = _peak_selector->selectPeaks(*_spectrum, m_freqFloor);
 
-    // Loris::Peaks::iterator rejected = thinPeaks(peaks, 0);
-    // fixBandwidth(peaks);
-    // if(m_bwAssocParam > 0) {
-    //     _bw_associator->associateBandwidth(peaks.begin(), rejected, peaks.end());
-    // }
-    // peaks.erase(rejected, peaks.end());
+    fixBandwidth(peaks);
+    if(m_bwAssocParam > 0) {
+        _bw_associator->associateBandwidth(peaks.begin(), peaks.end(), peaks.end());
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -474,7 +472,7 @@ Peaks LorisPeakDetection::find_peaks_in_frame(Frame* frame) {
         Peak* p = new Peak();
         p->amplitude = _analyzer->peaks[i].amplitude();
         p->frequency = _analyzer->peaks[i].frequency();
-        p->phase = 0.f;
+        p->bandwidth = _analyzer->peaks[i].bandwidth();
         peaks.push_back(p);
         frame->add_peak(p);
     }
diff --git a/tests/test_peak_detection.cpp b/tests/test_peak_detection.cpp
index 41bc735..4c09dbd 100644
--- a/tests/test_peak_detection.cpp
+++ b/tests/test_peak_detection.cpp
@@ -31,39 +31,54 @@ protected:
     int num_samples;
 
     void test_find_peaks_in_frame_basic() {
+        pd->clear();
+        pd->frame_size(2048);
+
         Frame* f = new Frame(2048, true);
         Peaks p = pd->find_peaks_in_frame(f);
         CPPUNIT_ASSERT(p.size() == 0);
+
         delete f;
+        pd->clear();
     }
 
     void test_find_peaks_basic() {
         sample* audio = new sample[1024];
+        pd->frame_size(512);
+
         Frames frames = pd->find_peaks(1024, audio);
         CPPUNIT_ASSERT(frames.size() == 2);
         for(int i = 0; i < frames.size(); i++) {
             CPPUNIT_ASSERT(frames[i]->num_peaks() == 0);
         }
+
+        delete audio;
     }
 
     void test_find_peaks_change_hop_frame_size() {
         sample* audio = new sample[1024];
         pd->frame_size(256);
         pd->hop_size(256);
+
         Frames frames = pd->find_peaks(1024, audio);
         CPPUNIT_ASSERT(frames.size() == 4);
         for(int i = 0; i < frames.size(); i++) {
             CPPUNIT_ASSERT(frames[i]->num_peaks() == 0);
         }
+
+        delete audio;
     }
 
     void test_find_peaks_audio() {
         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]));
         for(int i = 0; i < frames.size(); i++) {
             CPPUNIT_ASSERT(frames[i]->num_peaks() > 0);
         }
+
+        delete audio;
     }
 
 public: