Merge branch 'diadems' of https://github.com/yomguy/TimeSide into diadems

Conflicts:
	timeside/analyzer/irit_speech_4hz.py
	timeside/analyzer/irit_speech_entropy.py

diff --cc timeside/analyzer/__init__.py
Simple merge

diff --cc timeside/analyzer/irit_music_SLN.py
index 216c2bb313518439f84892674b6676a325fd0e1b,df2c8850e009605205cfa2a6bcb9c23d51b3215b..814cc831942ebfc714ef005868ed1bb3b7c19032
--- 1/timeside/analyzer/irit_music_SLN.py
--- 2/timeside/analyzer/irit_music_SLN.py
+++ b/timeside/analyzer/irit_music_SLN.py
@@@ -28,8 -28,9 +28,9 @@@ from timeside.api import IAnalyze
  from numpy import logical_and,array, hamming, dot, mean, float, arange, nonzero
  from numpy.fft import rfft
  from scipy.signal import firwin, lfilter
 -from pylab import plot,show
 +from timeside.analyzer.preprocessors import frames_adapter
  
+ 
  class IRITMusicSLN(Analyzer):
      implements(IAnalyzer)
  
@@@ -68,13 -58,10 +69,11 @@@
  
      def __str__(self):
          return "Music confidence indexes"
 -
 +        
 +    @frames_adapter
      def process(self, frames, eod=False):
-               
                return frames,eod
                
-               
      def post_process(self):
          '''
  

diff --cc timeside/analyzer/irit_music_SNB.py
index f1ed5560b3a34dacdd25b8e6df0afc4faf417341,a18291ef32b4b26b65cd9a102168b96c44f47fa6..900b72e124bb55e06633efc663f661058a6f05c0
--- 1/timeside/analyzer/irit_music_SNB.py
--- 2/timeside/analyzer/irit_music_SNB.py
+++ b/timeside/analyzer/irit_music_SNB.py
@@@ -28,12 -28,14 +28,14 @@@ from timeside.api import IAnalyze
  from numpy import logical_and,array, hamming, dot, mean, float, arange, nonzero
  from numpy.fft import rfft
  from scipy.signal import firwin, lfilter
 -from pylab import plot,show
 +from timeside.analyzer.preprocessors import frames_adapter
  
+ 
  class IRITMusicSNB(Analyzer):
+     
      implements(IAnalyzer)
  
 -    def __init__(self, blocksize=1024, stepsize=None) :
 +    def __init__(self, blocksize=1024, stepsize=None, samplerate=None) :
          super(IRITMusicSNB, self).__init__();
          self.parents.append(IRITDiverg())
          self.wLen     = 1.0
@@@ -67,13 -59,10 +69,11 @@@
  
      def __str__(self):
          return "Music confidence indexes"
 -
 +        
 +    @frames_adapter
      def process(self, frames, eod=False):
-               
                return frames,eod
                
-               
      def post_process(self):
          '''
  

diff --cc timeside/analyzer/irit_speech_4hz.py
index 5771891f9c70633cec0f4cb6db5f987af55c4911,3d22629d87adbecd5a7cda199cee7e9a9c4fffa2..ea8667796e33cbb7be7343f7ccb0b7464d14fe33
--- 1/timeside/analyzer/irit_speech_4hz.py
--- 2/timeside/analyzer/irit_speech_4hz.py
+++ b/timeside/analyzer/irit_speech_4hz.py
@@@ -48,7 -45,9 +47,7 @@@ class IRITSpeech4Hz(Analyzer)
          - modulLen                    (float)         : Length (in second) of the modulation computation window
      '''
  
-     @interfacedoc    
 -    implements(IAnalyzer)
 -
+     @interfacedoc
      def setup(self, channels=None, samplerate=None, blocksize=None,
                totalframes=None):
          super(IRITSpeech4Hz, self).setup(
@@@ -92,12 -85,7 +85,11 @@@
      def __str__(self):
          return "Speech confidences indexes"
  
-     @frames_adapter
      def process(self, frames, eod=False):
 +        '''
 +
 +        '''
 +
          frames = frames.T[0]
          # windowing of the frame (could be a changeable property)
          w = frames * hamming(len(frames))
@@@ -162,10 -150,10 +154,10 @@@
          segs.label_metadata.label = label
  
          segs.data_object.label = [convert[s[2]] for s in segList]
-         segs.data_object.time = [(float(s[0]) * self.input_blocksize /
+         segs.data_object.time = [(float(s[0]) * self.blocksize() /
                                   self.samplerate())
                                   for s in segList]
-         segs.data_object.duration = [(float(s[1]-s[0]) * self.input_blocksize /
 -        segs.data_object.duration = [(float(s[1]-s[0]+1) * self.blocksize() /
++        segs.data_object.duration = [(float(s[1]-s[0]) * self.blocksize() /
                                       self.samplerate())
                                       for s in segList]
  

diff --cc timeside/analyzer/irit_speech_entropy.py
index cdfaec5843ea96ac2d154a06cd3cfe0f72ffb46b,ffe7eb7f02644ef2b114f5dfc82dbce5ac6cc890..45be0066e25d5d12372785c887bfb30308ef8de1
--- 1/timeside/analyzer/irit_speech_entropy.py
--- 2/timeside/analyzer/irit_speech_entropy.py
+++ b/timeside/analyzer/irit_speech_entropy.py
@@@ -70,9 -66,8 +72,8 @@@ class IRITSpeechEntropy(Analyzer)
          return frames, eod
  
      def post_process(self):
- 
          entropyValue = array(self.entropyValue)
 -        w = self.modulLen * self.samplerate() / self.blocksize()
 +        w = self.modulLen * self.samplerate() / self.input_blocksize
          modulentropy = computeModulation(entropyValue, w, False)
          confEntropy = array(modulentropy - self.threshold) / self.threshold
          confEntropy[confEntropy > 1] = 1
@@@ -101,10 -96,10 +102,14 @@@
          segs.label_metadata.label = label
  
          segs.data_object.label = [convert[s[2]] for s in segList]
 -        segs.data_object.time = [(float(s[0]) * self.blocksize() /
 +        segs.data_object.time = [(float(s[0]) * self.input_blocksize /
                                   self.samplerate())
                                   for s in segList]
++<<<<<<< HEAD
 +        segs.data_object.duration = [(float(s[1]-s[0]) * self.input_blocksize /
++=======
+         segs.data_object.duration = [(float(s[1]-s[0]+1) * self.blocksize() /
++>>>>>>> 7c3ccb1c5b87c4639fee32df595cca1991265657
                                       self.samplerate())
                                       for s in segList]