From 7a7124f09745276cb4a5b6a35a1573518f743c17 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Mon, 15 Apr 2013 04:05:16 -0500 Subject: [PATCH] timeside/analyzer/aubio_*.py: fix process loop --- timeside/analyzer/aubio_melenergy.py | 3 +-- timeside/analyzer/aubio_mfcc.py | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/timeside/analyzer/aubio_melenergy.py b/timeside/analyzer/aubio_melenergy.py index 17fa893..16ddffa 100644 --- 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 4dd77b4..1de81f9 100644 --- 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): -- 2.39.5