Moved dynamic frame size calculation to the PeakDetection base class

2 files changed, 13 insertions, 18 deletions

diff --git a/basetypes.py b/basetypes.py
index 28311ad..5f685d5 100644
--- a/basetypes.py
+++ b/basetypes.py
@@ -120,6 +120,7 @@ class PeakDetection(object):
     def __init__(self):
         self._sampling_rate = 44100
         self._frame_size = 2048
+        self._static_frame_size = True
         self._hop_size = 512
         self._max_peaks = 100
         self._window_type = "hamming"
@@ -177,6 +178,9 @@ class PeakDetection(object):
     def set_window_size(self, window_size):
         self._window_size = window_size
         
+    def get_next_frame_size(self):
+        return self._frame_size
+
     def find_peaks_in_frame(self, frame):
         "Find and return all spectral peaks in a given frame of audio"
         current_peaks = []
@@ -189,6 +193,9 @@ class PeakDetection(object):
         self.peaks = []
         pos = 0
         while pos < len(audio):
+            # get the next frame size
+            if not self._static_frame_size:
+                self.frame_size = self.get_next_frame_size()
             # get the next frame
             frame = audio[pos:pos+self.frame_size]
             # pad if necessary
diff --git a/sms.py b/sms.py
index 39c3c2a..c22e871 100644
--- a/sms.py
+++ b/sms.py
@@ -46,9 +46,8 @@ class SMSPeakDetection(simpl.PeakDetection):
         # By default, SMS will change the size of the frames being read depending on the
         # detected fundamental frequency (if any) of the input sound. To prevent this 
         # behaviour (useful when comparing different analysis algorithms), set the
-        # static_frame_size variable to True
-        self.static_frame_size = False
-        #self.static_frame_size = True
+        # _static_frame_size variable to True
+        self._static_frame_size = False
         # set default hop and frame sizes to match those in the parent class
         self._analysis_params.iFrameRate = self.sampling_rate / self._hop_size
         pysms.sms_changeHopSize(self._hop_size, self._analysis_params)
@@ -142,6 +141,9 @@ class SMSPeakDetection(simpl.PeakDetection):
     def set_window_size(self, window_size):
         self._window_size = window_size
         self._analysis_params.iDefaultSizeWindow = window_size
+
+    def get_next_frame_size(self):
+        return self._analysis_params.sizeNextRead
         
     def find_peaks_in_frame(self, frame):
         "Find and return all spectral peaks in a given frame of audio"
@@ -168,22 +170,8 @@ class SMSPeakDetection(simpl.PeakDetection):
         """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 list of peaks returned for each frame."""
-        self.peaks = []
-        pos = 0
         self._analysis_params.iSizeSound = len(audio)
-        while pos < len(audio):
-            # change frame size based on sizeNextRead
-            if not self.static_frame_size:
-                if pos + self.frame_size < len(audio):
-                    self.frame_size = self._analysis_params.sizeNextRead
-                else:
-                    self.frame_size = len(audio) - pos
-            # get the next frame
-            frame = audio[pos:pos+self.frame_size]
-            # find peaks
-            self.peaks.append(self.find_peaks_in_frame(frame))
-            pos += self.hop_size
-        return self.peaks
+        return simpl.PeakDetection.find_peaks(self, audio)
     
 
 class SMSPartialTracking(simpl.PartialTracking):