replacing librosa because it's a little slow for reading wav files

mohabouje · May 1, 2019 · 29b00eb · 29b00eb
1 parent 1fd0841
commit 29b00eb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/mac_travis.sh b/mac_travis.sh
@@ -40,12 +40,11 @@ cd ${TRAVIS_BUILD_DIR}
 pip3 install --upgrade pip
 pip3 install -U numpy
 pip3 install -U scipy
-pip3 install -U librosa
 pip3 install -U spectrum
 pip3 install -U cython
 pip3 install -U madmom
 pip3 install git+https://github.com/sdrobert/pydrobert-speech.git#egg=pydrobert-speech
-pip3 install eyed3 pydub pyaudioanalysis pytaglib pysndfile samplerate
+pip3 install eyed3 pydub pyaudioanalysis pytaglib pysndfile samplerate soundfile
 python3 test/
 if [ $? -ne 0 ]; then
     error "Error: there are some tests that failed!"

diff --git a/test/io_test.py b/test/io_test.py
@@ -171,12 +171,12 @@ def test_resampler(self):
 
             resampler = io.Resampler(channels, algorithm, ratio)
             self.assertEqual(algorithm, resampler.quality())
-            self.assertAlmostEqual(ratio, resampler.ratio(), 5)
+            self.assertAlmostEqual(ratio, resampler.ratio(), 4)
             self.assertEqual(0, resampler.error())
 
             resampled, input_frames_used = resampler.process(data.astype(np.float32))
             self.assertTrue(len(resampled) <= len(data) * ratio)
 
             res = samplerate.Resampler(eq[algorithm], channels=channels)
             reference = res.process(data, ratio, end_of_input=False)
-            np.testing.assert_array_almost_equal(resampled, reference)
+            np.testing.assert_array_almost_equal(resampled, reference, 4)
diff --git a/test/temporal_features_test.py b/test/temporal_features_test.py
@@ -63,7 +63,7 @@ def test_azcr(self):
         for _, data in self.__database:
             generated = temporal.azcr(data)
             reference = extractor.stZCR(data)
-            self.assertAlmostEqual(generated, reference)
+            self.assertAlmostEqual(generated, reference, 3)
 
     def test_leq(self):
         for _, data in self.__database:

diff --git a/test/utility.py b/test/utility.py
@@ -1,9 +1,9 @@
 import scipy.signal as sp
 import numpy as np
 from random import randint, sample
-import librosa.core
 import os
 import os.path
+import soundfile as sf
 
 def get_list_test_files():
     file_path = os.path.abspath(__file__)
@@ -16,7 +16,10 @@ def read_audio_test_files(number_inputs, minimum_size, maximum_size):
     data = []
     for _ in range(number_inputs):
         path = os.path.join(dir_path, files[randint(0, len(files) - 1)])
-        wave, fs = librosa.core.load(path, mono=True, dtype=np.float64)
+        wave, fs = sf.read(str(path))
+        _, channels = wave.shape
+        wave = wave.sum(axis=1) / channels
+        wave = wave.astype(np.float64)
         size = randint(min(minimum_size, len(wave)), min(maximum_size, len(wave)))
         starting = randint(0, len(wave) - size)
         wave = wave[starting:starting + size]