add new audio test files, looping waveform tests with audio test files

diff --git a/tests/api/test_pipe_waveform.py b/tests/api/test_pipe_waveform.py
index 95d02f13f2d0b82d8f6293d65c927b58d7fc0c20..22604472852cac0eb4413118c1109c6327295a08 100644 (file)
--- a/tests/api/test_pipe_waveform.py
+++ b/tests/api/test_pipe_waveform.py
@@ -2,24 +2,34 @@
 from timeside.tests.api import examples
 from timeside.core import *
 from timeside.api import *
-import os.path
+import os
 
 use_gst = 1
 if use_gst:
-    from timeside.tests.api.gstreamer import FileDecoder, WavEncoder
+    from timeside.tests.api.gstreamer import FileDecoder
 else:
-    from timeside.tests.api.examples import FileDecoder, WavEncoder
+    from timeside.tests.api.examples import FileDecoder
 
-image_file = './waveform.png'
-source = os.path.join(os.path.dirname(__file__), "../samples/sweep.wav")
+sample_dir = '../samples'
+img_dir = './img'
+if not os.path.exists(img_dir):
+    os.mkdir(img_dir)
 
-decoder  = FileDecoder(source)
-waveform = examples.Waveform(width=1024, height=256, output=image_file, bg_color=(0,0,0), color_scheme='default')
+test_dict = {'sweep.wav': 'waveform_wav.png',
+            'sweep.flac': 'waveform_flac.png',
+            'sweep.ogg': 'waveform_ogg.png',
+            'sweep.mp3': 'waveform_mp3.png',
+            }
 
-(decoder | waveform).run()
-
-print 'frames per pixel = ', waveform.graph.samples_per_pixel
-print "render waveform to: %s" % image_file
-waveform.render()
+for source, image in test_dict.iteritems():
+    source = os.path.join(os.path.dirname(__file__), sample_dir + os.sep + source)
+    image = img_dir + os.sep + image
+    print 'Test : decoder(%s) | waveform (%s)' % (source, image)
+    decoder  = FileDecoder(source)
+    waveform = examples.Waveform(width=1024, height=256, output=image, 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()
 
 

diff --git a/tests/samples/sweep.flac b/tests/samples/sweep.flac
new file mode 100644 (file)
index 0000000..203f7cf
Binary files /dev/null and b/tests/samples/sweep.flac differ

diff --git a/tests/samples/sweep.mp3 b/tests/samples/sweep.mp3
new file mode 100644 (file)
index 0000000..0195695
Binary files /dev/null and b/tests/samples/sweep.mp3 differ

diff --git a/tests/samples/sweep.ogg b/tests/samples/sweep.ogg
new file mode 100644 (file)
index 0000000..b582d04
Binary files /dev/null and b/tests/samples/sweep.ogg differ

diff --git a/tests/samples/sweep.wav b/tests/samples/sweep.wav
index bc6411851b2819f4f74a9dbcf6d4e5504962a5af..b7f4e9e3e8b1f38a013d6dde447dae0303537437 100644 (file)
Binary files a/tests/samples/sweep.wav and b/tests/samples/sweep.wav differ

diff --git a/tests/samples/sweep_source.mp3 b/tests/samples/sweep_source.mp3
deleted file mode 100644 (file)
index 54b1621..0000000
Binary files a/tests/samples/sweep_source.mp3 and /dev/null differ