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 3beaa044ef5c9ce1bd0c1df83d6b6878f01272e1..2a59646cbf52438c044a3667141fd874afcb961c 100644 (file)
--- 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