Changeset 10a5413

Timestamp:

Oct 7, 2009, 6:26:59 PM (15 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, pitchshift, sampler, timestretch, yinfft+

Children:

1b88289

Parents:

daa4ca9

Message:

src/mathutils.c: add aubio_is_power_of_two and aubio_next_power_of_two

Files:

• configure.ac (modified) (1 diff)
• src/aubio_priv.h (modified) (1 diff)
• src/mathutils.c (modified) (1 diff)
• src/mathutils.h (modified) (1 diff)
• wscript (modified) (1 diff)

configure.ac

@@ -115 +115 @@
 
 dnl Check for header files
-AC_CHECK_HEADERS([string.h stdlib.h stdio.h math.h errno.h stdarg.h unistd.h signal.h],,)
+AC_CHECK_HEADERS([string.h stdlib.h stdio.h math.h limits.h errno.h stdarg.h unistd.h signal.h],,)
 AC_CHECK_HEADERS(fftw3.h,,AC_MSG_ERROR([Ouch! missing fftw3.h header]))
 AC_ARG_ENABLE(complex,

src/aubio_priv.h

@@ -61 +61 @@
 #if HAVE_STRING_H
 #include <string.h>
+#endif
+
+#if HAVE_LIMITS_H
+#include <limits.h> // for CHAR_BIT, in C99 standard
 #endif
 

src/mathutils.c

@@ -410 +410 @@
 }
 
+uint_t
+aubio_is_power_of_two(uint_t a) {
+  if ((a & a-1) == 0) {
+    return 1;
+  } else {
+    return 0; 
+  }
+}
+
+uint_t
+aubio_next_power_of_two(uint_t a) {
+  uint_t i;
+  a--;
+  for (i = 0; i < sizeof(uint_t) * CHAR_BIT; i++ ) {
+    a = a | a >> 1;
+  }
+  return a+1;
+}
+
 smpl_t
 aubio_db_spl (fvec_t * o)

src/mathutils.h

@@ -317 +317 @@
 smpl_t aubio_miditofreq (smpl_t midi);
 
+/** return 1 if a is a power of 2, 0 otherwise */
+uint_t aubio_is_power_of_two(uint_t a);
+
+/** return the next power of power of 2 greater than a */
+uint_t aubio_next_power_of_two(uint_t a);
+
 /** compute sound pressure level (SPL) in dB
 

wscript

@@ -54 +54 @@
   conf.check(header_name='math.h')
   conf.check(header_name='string.h')
+  conf.check(header_name='limits.h')
 
   # optionally use complex.h