Changeset d22cc42 for src

Timestamp:

Jul 16, 2012, 9:36:50 PM (12 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:

2ea7a10

Parents:

18c6b20

Message:

src/io/source_sndfile.c: refuse to run when when resampled hop_size does not match the requested one

File:

• src/io/source_sndfile.c (modified) (2 diffs)

src/io/source_sndfile.c

@@ -106 +106 @@
     s->input_data = new_fvec(s->input_hop_size);
     s->resampler = new_aubio_resampler(s->ratio, 0);
-    if (s-> ratio > 1) {
+    if (s->ratio > 1) {
+      // we would need to add a ring buffer for these
+      if ( (uint_t)(s->input_hop_size * s->ratio + .5)  != s->hop_size ) {
+        AUBIO_ERR("can not upsample from %d to %d\n", s->input_samplerate, s->samplerate);
+        goto beach;
+      }
       AUBIO_WRN("upsampling %s from %d to % d\n", s->path, s->input_samplerate, s->samplerate);
     }
@@ -124 +129 @@
 
 beach:
-  AUBIO_ERR("can not read %s at samplerate %dHz with hop_size of %d\n",
+  AUBIO_ERR("can not read %s at samplerate %dHz with a hop_size of %d\n",
       s->path, s->samplerate, s->hop_size);
   del_aubio_source_sndfile(s);