From aa7ebbbd912e0bc732d8a3cc3604e1327e226878 Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Mon, 15 Apr 2013 11:11:26 -0500 Subject: [PATCH] timeside/analyzer/aubio_pitch.py: use AnalyzerResult --- timeside/analyzer/aubio_pitch.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/timeside/analyzer/aubio_pitch.py b/timeside/analyzer/aubio_pitch.py index f06da9b..334c7c1 100644 --- a/timeside/analyzer/aubio_pitch.py +++ b/timeside/analyzer/aubio_pitch.py @@ -50,21 +50,22 @@ class AubioPitch(Processor): @staticmethod @interfacedoc def unit(): - return "Hz" + return "" def __str__(self): - return "%s %s" % (str(self.value), unit()) + return "pitch values" def process(self, frames, eod=False): i = 0 while i < frames.shape[0]: downmixed = frames[i:i+self.hop_s, :].sum(axis = -1) - time = self.block_read * self.hop_s * 1. / self.samplerate() - self.pitches += [[time, self.p(downmixed)[0]]] + #time = self.block_read * self.hop_s * 1. / self.samplerate() + self.pitches += [self.p(downmixed)[0]] i += self.hop_s self.block_read += 1 return frames, eod - def result(self): - return self.pitches - + def results(self): + pitch = AnalyzerResult(id = "aubio_pitch", name = "f0 (aubio)", unit = "Hz") + pitch.value = self.pitches + return AnalyzerResultContainer([pitch]) -- 2.39.5