From: Paul Brossier <piem@piem.org>
Date: Mon, 15 Apr 2013 19:29:07 +0000 (-0500)
Subject: timeside/analyzer/aubio_pitch.py: add mean and median, use container
X-Git-Tag: 0.5.0~115^2~16
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=20e2d91432b973bc75e4f81d2048fe43b8555d58;p=timeside.git

timeside/analyzer/aubio_pitch.py: add mean and median, use container
---

diff --git a/timeside/analyzer/aubio_pitch.py b/timeside/analyzer/aubio_pitch.py
index 3beaa04..2a59646 100644
--- a/timeside/analyzer/aubio_pitch.py
+++ b/timeside/analyzer/aubio_pitch.py
@@ -63,6 +63,21 @@ class AubioPitch(Processor):
         return frames, eod
 
     def results(self):
+
+        container = AnalyzerResultContainer()
+
+        self.pitches = numpy.array(self.pitches)
+
         pitch = AnalyzerResult(id = "aubio_pitch", name = "f0 (aubio)", unit = "Hz")
         pitch.value = self.pitches
-        return AnalyzerResultContainer([pitch])
+        container.add_result(pitch)
+
+        pitch_mean = AnalyzerResult(id = "aubio_pitch_mean", name = "f0 mean (aubio)", unit = "Hz")
+        pitch_mean.value = numpy.mean(self.pitches)
+        container.add_result(pitch_mean)
+
+        pitch_median = AnalyzerResult(id = "aubio_pitch_median", name = "f0 median (aubio)", unit = "Hz")
+        pitch_median.value = numpy.median(self.pitches)
+        container.add_result(pitch_median)
+
+        return container