Changeset cefa29d

Timestamp:

Oct 30, 2018, 10:24:08 AM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

4bc10e2

Parents:

7be77bb (diff), 27ed546 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'feature/note2freq'

Files:

• python/tests/test_note2midi.py (modified) (2 diffs)
• src/mathutils.c (modified) (2 diffs)

python/tests/test_note2midi.py

@@ -4 +4 @@
 from __future__ import unicode_literals
 
-from aubio import note2midi, freq2note, note2freq
+from aubio import note2midi, freq2note, note2freq, float_type
 from nose2.tools import params
 import unittest
@@ -128 +128 @@
     def test_note2freq_under(self):
         " make sure note2freq(A4) == 440"
-        self.assertEqual(440, note2freq("A4"))
+        if float_type == 'float32':
+            self.assertEqual(440, note2freq("A4"))
+        else:
+            self.assertLess(abs(note2freq("A4")-440), 1.e-12)
 
 if __name__ == '__main__':

src/mathutils.c

@@ -523 +523 @@
   /* log(freq/A-2)/log(2) */
   midi = freq / 6.875;
-  midi = LOG (midi) / 0.69314718055995;
+  midi = LOG (midi) / 0.6931471805599453;
   midi *= 12;
   midi -= 3;
@@ -535 +535 @@
   if (midi > 140.) return 0.; // avoid infs
   freq = (midi + 3.) / 12.;
-  freq = EXP (freq * 0.69314718055995);
+  freq = EXP (freq * 0.6931471805599453);
   freq *= 6.875;
   return freq;