Changes in / [b4f621b:512ab15]

Files:

• examples/utils.c (modified) (1 diff)
• python/demos/demo_mfcc.py (modified) (1 diff)
• src/io/source_apple_audio.c (modified) (4 diffs)
• src/io/source_sndfile.c (modified) (2 diffs)
• src/spectral/phasevoc.c (modified) (1 diff)
• tests/src/io/test-source_avcodec.c (modified) (2 diffs)
• wscript (modified) (2 diffs)

examples/utils.c

@@ -197 +197 @@
 #endif
   if (velo == 0) {
-    outmsg ("%f\n", blocks * hop_size / (float) samplerate);
+    verbmsg ("%f\n", blocks * hop_size / (float) samplerate);
   } else {
-    outmsg ("%f\t%f\t", mpitch, blocks * hop_size / (float) samplerate);
+    verbmsg ("%f\t%f\t", mpitch, blocks * hop_size / (float) samplerate);
   }
 }

python/demos/demo_mfcc.py

@@ -25 +25 @@
 m = mfcc(win_s, n_filters, n_coeffs, samplerate)
 
-mfccs = zeros([n_coeffs,])
+mfccs = zeros([13,])
 frames_read = 0
 while True:

src/io/source_apple_audio.c

@@ -61 +61 @@
   aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t);
 
-  if (path == NULL) {
-    AUBIO_ERROR("source_apple_audio: Aborted opening null path\n");
-    goto beach;
-  }
-
-  if ( (sint_t)block_size <= 0 ) {
-    AUBIO_ERROR("source_apple_audio: Can not open %s with null or negative block_size %d\n",
-        path, block_size);
-    goto beach;
-  }
-
-  if ( (sint_t)samplerate < 0 ) {
-    AUBIO_ERROR("source_apple_audio: Can not open %s with negative samplerate %d\n",
-        path, samplerate);
-    goto beach;
-  }
-
   s->block_size = block_size;
   s->samplerate = samplerate;
-  s->path = path;
 
   if ( aubio_source_apple_audio_open ( s, path ) ) {
@@ -158 +140 @@
         "error in ExtAudioFileSetProperty (%s)\n", s->path,
         getPrintableOSStatusError(errorstr, err));
-#if 0
+#if 1
   // print client and format descriptions
   AUBIO_DBG("Opened %s\n", s->path);
@@ -299 +281 @@
 
 uint_t aubio_source_apple_audio_seek (aubio_source_apple_audio_t * s, uint_t pos) {
-  OSStatus err = noErr;
-  if ((sint_t)pos < 0) {
-    AUBIO_ERROR("source_apple_audio: error while seeking in %s "
-        "(can not seek at negative position %d)\n",
-        s->path, pos);
-    err = -1;
-    goto beach;
-  }
-  // check if we are not seeking out of the file
-  SInt64 fileLengthFrames = 0;
-  UInt32 propSize = sizeof(fileLengthFrames);
-  ExtAudioFileGetProperty(s->audioFile,
-      kExtAudioFileProperty_FileLengthFrames, &propSize, &fileLengthFrames);
+  // after a short read, the bufferList size needs to resetted to prepare for a full read
+  AudioBufferList *bufferList = &s->bufferList;
+  bufferList->mBuffers[0].mDataByteSize = s->block_size * s->channels * sizeof (short);
   // compute position in the source file, before resampling
   smpl_t ratio = s->source_samplerate * 1. / s->samplerate;
   SInt64 resampled_pos = (SInt64)ROUND( pos * ratio );
-  if (resampled_pos > fileLengthFrames) {
-    AUBIO_ERR("source_apple_audio: trying to seek in %s at pos %d, "
-        "but file has only %d frames\n",
-        s->path, pos, (uint_t)(fileLengthFrames / ratio));
-    err = -1;
-    goto beach;
-  }
-  // after a short read, the bufferList size needs to resetted to prepare for a full read
-  AudioBufferList *bufferList = &s->bufferList;
-  bufferList->mBuffers[0].mDataByteSize = s->block_size * s->channels * sizeof (short);
-  // do the actual seek
-  err = ExtAudioFileSeek(s->audioFile, resampled_pos);
+  OSStatus err = ExtAudioFileSeek(s->audioFile, resampled_pos);
   if (err) {
     char_t errorstr[20];
@@ -333 +294 @@
         getPrintableOSStatusError(errorstr, err));
   }
-#if 0
-  // check position after seek
-  {
-    SInt64 outFrameOffset = 0;
-    err = ExtAudioFileTell(s->audioFile, &outFrameOffset);
-    if (err) {
-      char_t errorstr[20];
-      AUBIO_ERROR("source_apple_audio: error while seeking %s at %d "
-          "in ExtAudioFileTell (%s)\n", s->path, pos,
-          getPrintableOSStatusError(errorstr, err));
-    }
-    AUBIO_DBG("source_apple_audio: asked seek at %d, tell got %d\n",
-        pos, (uint_t)(outFrameOffset / ratio + .5));
-  }
-#endif
-beach:
   return err;
 }

src/io/source_sndfile.c

@@ -185 +185 @@
   if (*read < s->hop_size) {
     for (j = *read; j < s->hop_size; j++) {
-      read_data->data[j] = 0;
+      data[j] = 0;
     }
   }
@@ -248 +248 @@
     for (i = 0; i < read_data->height; i++) {
       for (j = *read; j < s->hop_size; j++) {
-        read_data->data[i][j] = 0.;
+        data[i][j] = 0.;
       }
     }

src/spectral/phasevoc.c

@@ -77 +77 @@
   } */
 
-  if ((sint_t)hop_s < 1) {
+  if (hop_s < 1) {
     AUBIO_ERR("got hop_size %d, but can not be < 1\n", hop_s);
     goto beach;
-  } else if ((sint_t)win_s < 1) {
-    AUBIO_ERR("got buffer_size %d, but can not be < 1\n", win_s);
+  } else if (win_s < 1) {
+    AUBIO_ERR("got buffer_size %d, but can not be < 2\n", win_s);
     goto beach;
   } else if (win_s < hop_s) {

tests/src/io/test-source_avcodec.c

@@ -24 +24 @@
   }
 
-#ifdef HAVE_LIBAV
+#ifdef HAVE_AVCODEC
   uint_t samplerate = 0;
   uint_t hop_size = 256;
@@ -53 +53 @@
   del_aubio_source_avcodec (s);
 beach:
-#else /* HAVE_LIBAV */
+#else
   err = 3;
   PRINT_ERR("aubio was not compiled with aubio_source_avcodec\n");
-#endif /* HAVE_LIBAV */
+#endif /* HAVE_AVCODEC */
   return err;
 }

wscript

@@ -118 +118 @@
     if target_platform in [ 'ios', 'iosimulator' ]:
         ctx.define('TARGET_OS_IPHONE', 1)
-        SDKVER="7.1"
+        SDKVER="7.0"
         MINSDKVER="6.1"
         ctx.env.CFLAGS += ['-std=c99']
@@ -125 +125 @@
             DEVROOT += "/Developer/Platforms/iPhoneOS.platform/Developer"
             SDKROOT = "%(DEVROOT)s/SDKs/iPhoneOS%(SDKVER)s.sdk" % locals()
-            #ctx.env.CFLAGS += [ '-arch', 'arm64' ]
+            ctx.env.CFLAGS += [ '-arch', 'arm64' ]
             ctx.env.CFLAGS += [ '-arch', 'armv7' ]
             ctx.env.CFLAGS += [ '-arch', 'armv7s' ]
-            #ctx.env.LINKFLAGS += [ '-arch', 'arm64' ]
+            ctx.env.LINKFLAGS += [ '-arch', 'arm64' ]
             ctx.env.LINKFLAGS += ['-arch', 'armv7']
             ctx.env.LINKFLAGS += ['-arch', 'armv7s']