diff vamp/frames.py @ 95:3e5791890b65

refactor, add process_frames

--- a/vamp/frames.py	Mon Feb 02 16:32:44 2015 +0000
+++ b/vamp/frames.py	Mon Feb 02 17:15:15 2015 +0000
@@ -2,8 +2,8 @@
 
 import numpy
 
-def frames_from_array(arr, step_size, frameSize):
-    """Generate a list of frames of size frameSize, extracted from the input array arr at step_size intervals"""
+def frames_from_array(arr, step_size, frame_size):
+    """Generate a list of frames of size frame_size, extracted from the input array arr at step_size intervals"""
     # presumably such a function exists in many places, but I need practice
     assert(step_size > 0)
     if arr.ndim == 1: # turn 1d into 2d array with 1 channel
@@ -12,10 +12,10 @@
     n = arr.shape[1]
     i = 0
     while (i < n):
-        frame = arr[:, i : i + frameSize]
+        frame = arr[:, i : i + frame_size]
         w = frame.shape[1]
-        if (w < frameSize):
-            pad = numpy.zeros((frame.shape[0], frameSize - w))
+        if (w < frame_size):
+            pad = numpy.zeros((frame.shape[0], frame_size - w))
             frame = numpy.concatenate((frame, pad), 1)
         yield frame
         i = i + step_size