timeside/analyzer/aubio_*.py: fix process loop

diff --git a/timeside/analyzer/aubio_melenergy.py b/timeside/analyzer/aubio_melenergy.py
index 17fa893e604fb6df7a9dd84accf9a6c4ee885586..16ddffa61c90e52c3da62d8a40f66cbf1ebd5ecd 100644 (file)
--- a/timeside/analyzer/aubio_melenergy.py
+++ b/timeside/analyzer/aubio_melenergy.py
@@ -56,14 +56,13 @@ class AubioMelEnergy(Processor):
 
     def process(self, frames, eod=False):
         i = 0
-        while True:
+        while i < frames.shape[0]:
             downmixed_samples = frames[i:i+self.hop_s, :].sum(axis = -1)
             time = self.block_read * self.hop_s * 1. / self.samplerate()
             fftgrain = self.pvoc(downmixed_samples)
             self.melenergy_results = numpy.vstack( [ self.melenergy_results, self.melenergy(fftgrain) ])
             i += self.hop_s
             self.block_read += 1
-            if self.hop_s + i < frames.shape[0]: break
         return frames, eod
 
     def results(self):

diff --git a/timeside/analyzer/aubio_mfcc.py b/timeside/analyzer/aubio_mfcc.py
index 4dd77b485d3e379e76ccb8a4bdaee07f68472963..1de81f9558852f388958cedc454433af5b4c706b 100644 (file)
--- a/timeside/analyzer/aubio_mfcc.py
+++ b/timeside/analyzer/aubio_mfcc.py
@@ -55,7 +55,7 @@ class AubioMfcc(Processor):
 
     def process(self, frames, eod=False):
         i = 0
-        while True:
+        while i < frames.shape[0]:
             downmixed_samples = frames[i:i+self.hop_s, :].sum(axis = -1)
             time = self.block_read * self.hop_s * 1. / self.samplerate()
             fftgrain = self.pvoc(downmixed_samples)
@@ -63,7 +63,6 @@ class AubioMfcc(Processor):
             self.mfcc_results = numpy.vstack((self.mfcc_results, coeffs))
             i += self.hop_s
             self.block_read += 1
-            if self.hop_s + i < frames.shape[0]: break
         return frames, eod
 
     def results(self):