summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/simpl/base.cpp62
-rw-r--r--src/simpl/base.h19
-rw-r--r--tests/testbase.cpp81
3 files changed, 152 insertions, 10 deletions
diff --git a/src/simpl/base.cpp b/src/simpl/base.cpp
index bcfea65..91bf50e 100644
--- a/src/simpl/base.cpp
+++ b/src/simpl/base.cpp
@@ -134,16 +134,34 @@ void Frame::add_peak(Peak peak)
_peaks.push_back(peak);
}
+void Frame::add_peaks(Peaks* peaks)
+{
+ for(Peaks::iterator i = peaks->begin(); i != peaks->end(); i++)
+ {
+ add_peak(Peak(*i));
+ }
+}
+
Peak Frame::peak(int peak_number)
{
return _peaks[peak_number];
}
-Peaks::iterator Frame::peaks()
+void Frame::clear_peaks()
+{
+ _peaks.clear();
+}
+
+Peaks::iterator Frame::peaks_begin()
{
return _peaks.begin();
}
+Peaks::iterator Frame::peaks_end()
+{
+ return _peaks.end();
+}
+
// Frame - partials
// ----------------
@@ -249,6 +267,12 @@ PeakDetection::PeakDetection()
PeakDetection::~PeakDetection()
{
+ while(!_frames.empty())
+ {
+ Frame* f = &_frames.back();
+ _frames.pop_back();
+ delete f;
+ }
}
int PeakDetection::sampling_rate()
@@ -340,4 +364,40 @@ Frames* PeakDetection::frames()
return &_frames;
}
+// Find and return all spectral peaks in a given frame of audio
+Peaks* PeakDetection::find_peaks_in_frame(const Frame& frame)
+{
+ Peaks* peaks = new Peaks();
+ return peaks;
+}
+
+// Find and return all spectral peaks in a given audio signal.
+// If the signal contains more than 1 frame worth of audio, it will be broken
+// up into separate frames, each containing a std::vector of peaks.
+Frames* PeakDetection::find_peaks(const samples& audio)
+{
+ _frames.clear();
+ unsigned int pos = 0;
+ while(pos < audio.size())
+ {
+ // get the next frame size
+ if(!_static_frame_size)
+ {
+ _frame_size = next_frame_size();
+ }
+
+ // get the next frame
+ Frame* f = new Frame();
+ f->size(_frame_size);
+ f->audio(&(audio[pos]));
+
+ // find peaks
+ f->add_peaks(find_peaks_in_frame(*f));
+ _frames.push_back(*f);
+ pos += _hop_size;
+ }
+
+ return &_frames;
+}
+
} // end of namespace Simpl
diff --git a/src/simpl/base.h b/src/simpl/base.h
index ad201b3..15a66a8 100644
--- a/src/simpl/base.h
+++ b/src/simpl/base.h
@@ -103,8 +103,11 @@ public:
int max_peaks();
void max_peaks(int new_max_peaks);
void add_peak(Peak peak);
+ void add_peaks(Peaks* peaks);
Peak peak(int peak_number);
- Peaks::iterator peaks();
+ void clear_peaks();
+ Peaks::iterator peaks_begin();
+ Peaks::iterator peaks_end();
// partials
int num_partials();
@@ -136,7 +139,7 @@ typedef std::vector<Frame> Frames;
class PeakDetection
{
-protected:
+private:
int _sampling_rate;
int _frame_size;
bool _static_frame_size;
@@ -149,7 +152,7 @@ protected:
public:
PeakDetection();
- ~PeakDetection();
+ virtual ~PeakDetection();
int sampling_rate();
void sampling_rate(int new_sampling_rate);
@@ -157,7 +160,7 @@ public:
void frame_size(int new_frame_size);
bool static_frame_size();
void static_frame_size(bool new_static_frame_size);
- int next_frame_size();
+ virtual int next_frame_size();
int hop_size();
void hop_size(int new_hop_size);
int max_peaks();
@@ -169,6 +172,14 @@ public:
number min_peak_separation();
void min_peak_separation(number new_min_peak_separation);
Frames* frames();
+
+ // Find and return all spectral peaks in a given frame of audio
+ virtual Peaks* find_peaks_in_frame(const Frame& frame);
+
+ // Find and return all spectral peaks in a given audio signal.
+ // If the signal contains more than 1 frame worth of audio, it will be broken
+ // up into separate frames, with a std::vector of peaks returned for each frame.
+ virtual Frames* find_peaks(const samples& audio);
};
} // end of namespace Simpl
diff --git a/tests/testbase.cpp b/tests/testbase.cpp
index 02015bf..2677ae7 100644
--- a/tests/testbase.cpp
+++ b/tests/testbase.cpp
@@ -122,8 +122,10 @@ class TestFrame : public CPPUNIT_NS::TestCase
CPPUNIT_TEST(test_size);
CPPUNIT_TEST(test_max_peaks);
CPPUNIT_TEST(test_max_partials);
- CPPUNIT_TEST(test_peaks);
- CPPUNIT_TEST(test_partials);
+ CPPUNIT_TEST(test_add_peak);
+ CPPUNIT_TEST(test_add_peaks);
+ CPPUNIT_TEST(test_peak_clear);
+ CPPUNIT_TEST(test_peak_iteration);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -162,19 +164,72 @@ protected:
frame->max_partials(100);
}
- void test_peaks()
+ void test_add_peak()
{
Peak p = Peak();
p.amplitude = 1.5;
frame->add_peak(p);
CPPUNIT_ASSERT(frame->max_peaks() == 100);
CPPUNIT_ASSERT(frame->num_peaks() == 1);
- CPPUNIT_ASSERT(frame->peak(0).amplitude == 1.5);
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.5, frame->peak(0).amplitude, PRECISION);
+ frame->clear_peaks();
}
- void test_partials()
+ void test_add_peaks()
{
+ Peaks* peaks = new Peaks();
+ Peak p1 = Peak();
+ p1.amplitude = 1.0;
+ peaks->push_back(p1);
+
+ Peak p2 = Peak();
+ p2.amplitude = 2.0;
+ peaks->push_back(p2);
+
+ frame->add_peaks(peaks);
+ CPPUNIT_ASSERT(frame->num_peaks() == 2);
+
+ frame->clear_peaks();
+ delete peaks;
+ }
+
+ void test_peak_clear()
+ {
+ Peak p = Peak();
+ p.amplitude = 1.5;
+ frame->add_peak(p);
+ CPPUNIT_ASSERT(frame->num_peaks() == 1);
+ frame->clear_peaks();
+ CPPUNIT_ASSERT(frame->num_peaks() == 0);
+ }
+
+ void test_peak_iteration()
+ {
+ Peak p1 = Peak();
+ p1.amplitude = 1.0;
+ frame->add_peak(p1);
+
+ Peak p2 = Peak();
+ p2.amplitude = 2.0;
+ frame->add_peak(p2);
+
+ CPPUNIT_ASSERT(frame->num_peaks() == 2);
+
+ int peak_num = 0;
+ for(Peaks::iterator i = frame->peaks_begin(); i != frame->peaks_end(); i++)
+ {
+ if(peak_num == 0)
+ {
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(1.0, i->amplitude, PRECISION);
+ }
+ else if(peak_num == 1)
+ {
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(2.0, i->amplitude, PRECISION);
+ }
+ peak_num += 1;
+ }
+ frame->clear_peaks();
}
public:
@@ -204,6 +259,8 @@ class TestPeakDetection : public CPPUNIT_NS::TestCase
CPPUNIT_TEST(test_window_type);
CPPUNIT_TEST(test_window_size);
CPPUNIT_TEST(test_min_peak_separation);
+ CPPUNIT_TEST(test_find_peaks_in_frame);
+ CPPUNIT_TEST(test_find_peaks);
CPPUNIT_TEST_SUITE_END();
protected:
@@ -284,6 +341,20 @@ protected:
pd->min_peak_separation(1.0);
}
+ void test_find_peaks_in_frame()
+ {
+ Frame* f = new Frame();
+ Peaks* p = pd->find_peaks_in_frame(*f);
+ CPPUNIT_ASSERT(p->size() == 0);
+ delete p;
+ delete f;
+ }
+
+ void test_find_peaks()
+ {
+
+ }
+
public:
void setUp()
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-05 13:22:27 +0000