From: Thomas Fillon <thomas@parisson.com>
Date: Thu, 17 Jul 2014 16:11:12 +0000 (+0200)
Subject: Merge Dev into Diadems
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=80e142b02548183f4ddb0fd68d4138c012c4fd14;p=timeside.git

Merge Dev into Diadems
---

80e142b02548183f4ddb0fd68d4138c012c4fd14
diff --cc setup.py
index 595f539,4520ec2..aea456a
--- a/setup.py
+++ b/setup.py
@@@ -58,9 -59,8 +59,10 @@@ setup
          'django-extensions',
          'djangorestframework',
          'south',
-         'py_sonicvisualiser',
++<        'py_sonicvisualiser',
+         'traits'
          ],
 +
    platforms=['OS Independent'],
    license='Gnu Public License V2',
    classifiers = CLASSIFIERS,
diff --cc timeside/analyzer/irit_speech_4hz.py
index e207f56,18ad391..9fbf600
--- a/timeside/analyzer/irit_speech_4hz.py
+++ b/timeside/analyzer/irit_speech_4hz.py
@@@ -24,10 -24,9 +24,10 @@@ from timeside.analyzer.core import Anal
  from timeside.analyzer.utils import melFilterBank, computeModulation
  from timeside.analyzer.utils import segmentFromValues
  from timeside.api import IAnalyzer
- from numpy import array, hamming, dot, mean, float
+ from numpy import array, hamming, dot, mean, float, mod
  from numpy.fft import rfft
  from scipy.signal import firwin, lfilter
 +from timeside.analyzer.preprocessors import frames_adapter
  
  
  class IRITSpeech4Hz(Analyzer):
@@@ -64,16 -62,20 +63,25 @@@
          self.orderFilter = 100
  
          self.normalizeEnergy = True
+         self.modulLen = 2.0
+ 
+         # Median filter duration in second
+         self.medfilt_duration = medfilt_duration
+ 
+     @interfacedoc
+     def setup(self, channels=None, samplerate=None, blocksize=None,
+               totalframes=None):
+         super(IRITSpeech4Hz, self).setup(
+             channels, samplerate, blocksize, totalframes)
          self.nFFT = 2048
          self.nbFilters = 30
-         self.modulLen = 2.0
          self.melFilter = melFilterBank(self.nbFilters, self.nFFT, samplerate)
  
 +        self.wLen = 0.016
 +        self.wStep = 0.008
 +        self.input_blocksize = int(self.wLen * samplerate)
 +        self.input_stepsize = int(self.wStep * samplerate)
 +
      @staticmethod
      @interfacedoc
      def id():