From: yomguy <yomguy@parisson.com>
Date: Thu, 2 Sep 2010 20:54:24 +0000 (+0000)
Subject: fix test for dB max_level result, rm waveform_joy : sorry dude, I have to make it... 
X-Git-Tag: 0.3.2~107
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a980dce9d34fbe6583f66d22a015e90762d2376b;p=timeside.git

fix test for dB max_level result, rm waveform_joy : sorry dude, I have to make it exclusive for my customer...
---

diff --git a/timeside/__init__.py b/timeside/__init__.py
index 37fe08f..4d760f6 100644
--- a/timeside/__init__.py
+++ b/timeside/__init__.py
@@ -9,7 +9,7 @@ import timeside.decoder
 import timeside.encoder
 import timeside.grapher
 import timeside.analyzer
-#import timeside.tests
+from timeside.core import *
 
 
 
diff --git a/timeside/grapher/waveform_joy.py b/timeside/grapher/waveform_joy.py
deleted file mode 100644
index 1a6ede3..0000000
--- a/timeside/grapher/waveform_joy.py
+++ /dev/null
@@ -1,184 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright (c) 2007-2010 Guillaume Pellerin <yomguy@parisson.com>
-# Copyright (c) 2010 Olivier Guilyardi <olivier@samalyse.com>
-
-# This file is part of TimeSide.
-
-# TimeSide is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-
-# TimeSide is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with TimeSide.  If not, see <http://www.gnu.org/licenses/>.
-
-
-from timeside.core import Processor, implements, interfacedoc, FixedSizeInputAdapter
-from timeside.api import IGrapher
-from timeside.grapher.core import *
-
-class WaveformImageJoyContour(WaveformImage):
-
-    def __init__(self, image_width, image_height, nframes, samplerate, fft_size, bg_color, color_scheme, ndiv=1, symetry=None):
-        WaveformImage.__init__(self, image_width, image_height, nframes, samplerate, fft_size, bg_color, color_scheme)
-        self.contour = numpy.zeros(self.image_width)
-        self.centroids = numpy.zeros(self.image_width)
-        self.ndiv = ndiv
-        self.x = numpy.r_[0:self.image_width-1:1]
-        self.dx1 = self.x[1]-self.x[0]
-        self.symetry = symetry
-
-    def get_peaks_contour(self, x, peaks, spectral_centroid=None):
-        self.contour[x] = numpy.max(peaks)
-        self.centroids[x] = spectral_centroid
-
-    def mean(self, samples):
-        return numpy.mean(samples)
-
-    def normalize(self, contour):
-        contour = contour-min(contour)
-        return contour/max(contour)
-
-    def draw_peaks_contour(self):
-        contour = self.contour.copy()
-
-        # Smoothing
-        contour = smooth(contour, window_len=16)
-
-        # Normalize
-        contour = self.normalize(contour)
-
-        # Scaling
-        #ratio = numpy.mean(contour)/numpy.sqrt(2)
-        ratio = 1
-        contour = self.normalize(numpy.expm1(contour/ratio))*(1-10**-6)
-
-        # Spline
-        #contour = cspline1d(contour)
-        #contour = cspline1d_eval(contour, self.x, dx=self.dx1, x0=self.x[0])
-
-        if self.symetry:
-            height = int(self.image_height/2)
-        else:
-            height = self.image_height
-        
-        # Multicurve rotating
-        for i in range(0,self.ndiv):
-            self.previous_x, self.previous_y = None, None
-
-            #bright_color = 255
-            bright_color = int(255*(1-float(i)/(self.ndiv*2)))
-#            bright_color = 255-bright_color+150
-#            line_color = self.color_lookup[int(self.centroids[j]*255.0)]
-            line_color = (bright_color,bright_color,bright_color)
-
-            # Linear
-            #contour = contour*(1.0-float(i)/self.ndiv)
-            #contour = contour*(1-float(i)/self.ndiv)
-
-            # Cosine
-            contour = contour*numpy.arccos(float(i)/self.ndiv)*2/numpy.pi
-            #contour = self.contour*(1-float(i)*numpy.arccos(float(i)/self.ndiv)*2/numpy.pi/self.ndiv)
-
-            # Negative Sine
-            #contour = contour + ((1-contour)*2/numpy.pi*numpy.arcsin(float(i)/self.ndiv))
-
-            curve = (height-1)*contour
-#            curve = contour*(height-2)/2+height/2
-            
-            for x in self.x:
-                x = int(x)
-                y = curve[x]
-                if not x == 0:
-                    if not self.symetry:
-                        self.draw.line([self.previous_x, self.previous_y, x, y], line_color)
-                        self.draw_anti_aliased_pixels(x, y, y, line_color)
-                    else:
-                        self.draw.line([self.previous_x, self.previous_y+height, x, y+height], line_color)
-                        self.draw_anti_aliased_pixels(x, y+height, y+height, line_color)
-                        self.draw.line([self.previous_x, -self.previous_y+height, x, -y+height], line_color)
-                        self.draw_anti_aliased_pixels(x, -y+height, -y+height, line_color)
-                else:
-                    if not self.symetry:
-                        self.draw.point((x, y), line_color)
-                    else:
-                        self.draw.point((x, y+height), line_color)
-                self.previous_x, self.previous_y = x, y
-
-    def process(self, frames, eod):
-        if len(frames) != 1:
-            buffer = frames[:,0].copy()
-            buffer.shape = (len(buffer),1)
-            for samples, end in self.pixels_adapter.process(buffer, eod):
-                if self.pixel_cursor < self.image_width:
-                    #(spectral_centroid, db_spectrum) = self.spectrum.process(buffer, True)
-                    peaks = self.peaks(samples)
-                    self.get_peaks_contour(self.pixel_cursor, peaks)
-                    self.pixel_cursor += 1
-        if eod:
-            self.draw_peaks_contour()
-
-    def save(self, filename):
-        """ Apply last 2D transforms and write all pixels to the file. """
-        # middle line (0 for none)
-        a = 1
-        for x in range(self.image_width):
-            self.pixel[x, self.image_height/2] = tuple(map(lambda p: p+a, self.pixel[x, self.image_height/2]))
-        self.image = self.image.transpose(Image.FLIP_TOP_BOTTOM)
-        self.image.save(filename)
-
-
-class WaveformJoyDiv(Processor):
-    implements(IGrapher)
-
-    FFT_SIZE = 0x400
-
-    @interfacedoc
-    def __init__(self, width=1024, height=256, bg_color=(136,136,136), color_scheme='default'):
-        self.width = width
-        self.height = height
-        self.bg_color = bg_color
-        self.color_scheme = color_scheme
-        self.graph = None
-        self.ndiv = 4
-        self.symetry = False
-
-    @staticmethod
-    @interfacedoc
-    def id():
-        return "waveform_joydiv"
-
-    @staticmethod
-    @interfacedoc
-    def name():
-        return "Waveform JoyDiv"
-
-    @interfacedoc
-    def set_colors(self, background, scheme):
-        self.bg_color = background
-        self.color_scheme = scheme
-
-    @interfacedoc
-    def setup(self, channels=None, samplerate=None, nframes=None):
-        super(WaveformJoyDiv, self).setup(channels, samplerate, nframes)
-        if self.graph:
-            self.graph = None
-        self.graph = WaveformImageJoyContour(self.width, self.height, self.nframes(), self.samplerate(), self.FFT_SIZE,
-                                    bg_color=self.bg_color, color_scheme=self.color_scheme,  ndiv=self.ndiv, symetry=self.symetry)
-
-    @interfacedoc
-    def process(self, frames, eod=False):
-        self.graph.process(frames, eod)
-        return frames, eod
-
-    @interfacedoc
-    def render(self, output):
-        if output:
-            self.graph.save(output)
-        return self.graph.image
diff --git a/timeside/tests/api/test_pipe.py b/timeside/tests/api/test_pipe.py
index fb3dd6c..629b3e9 100644
--- a/timeside/tests/api/test_pipe.py
+++ b/timeside/tests/api/test_pipe.py
@@ -7,8 +7,9 @@ from timeside.analyzer import *
 from timeside.encoder import *
 from timeside.api import *
 from sys import stdout
-
 import os.path
+import numpy
+
 source = os.path.join(os.path.dirname(__file__),  "../samples/guitar.wav")
 
 print "Normalizing %s" % source
@@ -19,8 +20,8 @@ duration = Duration()
 (decoder | maxlevel | duration).run()
 
 gain = 1
-if maxlevel.result() > 0:
-    gain = 0.9 / maxlevel.result()
+if maxlevel.result() < 0:
+    gain = 0.9 / numpy.exp(maxlevel.result()/20)
 
 print "input maxlevel: %f" % maxlevel.result()
 print "gain: %f" % gain
diff --git a/timeside/tests/api/test_pipe_spectrogram.py b/timeside/tests/api/test_pipe_spectrogram.py
index 4743071..49eaa8c 100644
--- a/timeside/tests/api/test_pipe_spectrogram.py
+++ b/timeside/tests/api/test_pipe_spectrogram.py
@@ -22,11 +22,11 @@ for source, image in test_dict.iteritems():
     image = img_dir + os.sep + image
     print 'Test : decoder(%s) | waveform (%s)' % (source, image)
     decoder  = FileDecoder(audio)
-    spectrogram = Spectrogram(width=1024, height=256, output=image, bg_color=(0,0,0), color_scheme='default')
+    spectrogram = Spectrogram(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
     (decoder | spectrogram).run()
     print 'frames per pixel = ', spectrogram.graph.samples_per_pixel
     print "render spectrogram to: %s" %  image
-    spectrogram.render()
+    spectrogram.render(image)
 
 
 
diff --git a/timeside/tests/api/test_pipe_waveform.py b/timeside/tests/api/test_pipe_waveform.py
index d21ecdc..bbfb54a 100644
--- a/timeside/tests/api/test_pipe_waveform.py
+++ b/timeside/tests/api/test_pipe_waveform.py
@@ -22,10 +22,10 @@ for source, image in test_dict.iteritems():
     image = img_dir + os.sep + image
     print 'Test : decoder(%s) | waveform (%s)' % (source, image)
     decoder  = FileDecoder(audio)
-    waveform = Waveform(width=1024, height=256, output=image, bg_color=(0,0,0), color_scheme='default')
+    waveform = Waveform(width=1024, height=256, bg_color=(0,0,0), color_scheme='default')
     (decoder | waveform).run()
     print 'frames per pixel = ', waveform.graph.samples_per_pixel
     print "render waveform to: %s" %  image
-    waveform.render()
+    waveform.render(image)