Changeset 8ba8bbe

Timestamp:

Sep 21, 2016, 3:47:48 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/cnn, feature/crepe, feature/pitchshift, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch

Children:

e2645cb

Parents:

6e8aa74 (diff), fa5d8ad (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 'master' into pitchshift

Files:

• .appveyor.yml (modified) (1 diff)
• src/io/source_sndfile.c (modified) (1 diff)
• src/io/source_wavread.c (modified) (2 diffs)

.appveyor.yml

@@ -61 +61 @@
   - "pip install ."
   - "python python\\demos\\demo_create_test_sounds.py"
-  - "nose2"
+  - "nose2 --verbose"
   # clean up
   - waf distclean

src/io/source_sndfile.c

@@ -99 +99 @@
   if (s->handle == NULL) {
     /* show libsndfile err msg */
-    AUBIO_ERR("source_sndfile: Failed opening %s: %s\n", s->path, sf_strerror (NULL));
+    AUBIO_ERR("source_sndfile: Failed opening %s (%s)\n", s->path,
+        sf_strerror (NULL));
     goto beach;
   }

src/io/source_wavread.c

@@ -136 +136 @@
     }
     bytes_read += bytes_junk;
-    bytes_expected += bytes_junk;
+    bytes_expected += bytes_junk + 4;
     // now really read the fmt chunk
-    fread(buf, 1, 4, s->fid);
+    bytes_read += fread(buf, 1, 4, s->fid);
     buf[4] = '\0';
   }
@@ -230 +230 @@
   bytes_read += fread(buf, 1, 4, s->fid);
   buf[4] = '\0';
-  if ( strcmp((const char *)buf, "data") != 0 ) {
-    AUBIO_ERR("source_wavread: data RIFF header not found in %s\n", s->path);
-    goto beach;
+  while ( strcmp((const char *)buf, "data") != 0 ) {
+    if (feof(s->fid) || ferror(s->fid)) {
+      AUBIO_ERR("source_wavread: no data RIFF header found in %s\n", s->path);
+      goto beach;
+    }
+    bytes_junk = fread(buf, 1, 4, s->fid);
+    buf[4] = '\0';
+    bytes_junk += read_little_endian(buf, 4);
+    if (fseek(s->fid, bytes_read + bytes_junk, SEEK_SET) != 0) {
+      AUBIO_ERR("source_wavread: could not seek past unknown chunk in %s (%s)\n",
+          s->path, strerror(errno));
+      goto beach;
+    }
+    bytes_read += bytes_junk;
+    bytes_expected += bytes_junk+ 4;
+    bytes_read += fread(buf, 1, 4, s->fid);
+    buf[4] = '\0';
   }