Changeset 447c673

Timestamp:

Dec 6, 2013, 8:38:31 PM (11 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:

7816f2b

Parents:

919139b

Message:

src/io/source_sndfile.c: also check parameters here, synchronise tests

Files:

• src/io/source_sndfile.c (modified) (2 diffs)
• tests/src/io/test-source.c (modified) (2 diffs)
• tests/src/io/test-source_apple_audio.c (modified) (1 diff)
• tests/src/io/test-source_sndfile.c (modified) (3 diffs)

src/io/source_sndfile.c

@@ -67 +67 @@
   if (path == NULL) {
     AUBIO_ERR("Aborted opening null path\n");
-    return NULL;
+    goto beach;
+  }
+  if ((sint_t)samplerate < 0) {
+    AUBIO_ERR("Can not open %s with samplerate %d\n", path, samplerate);
+    goto beach;
+  }
+  if ((sint_t)hop_size <= 0) {
+    AUBIO_ERR("Can not open %s with hop_size %d\n", path, hop_size);
+    goto beach;
   }
 
@@ -134 +142 @@
 
 beach:
-  AUBIO_ERR("can not read %s at samplerate %dHz with a hop_size of %d\n",
-      s->path, s->samplerate, s->hop_size);
+  //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);
   return NULL;

tests/src/io/test-source.c

@@ -28 +28 @@
   char_t *source_path = argv[1];
 
+
+  aubio_source_t* s =
+    new_aubio_source(source_path, samplerate, hop_size);
+  if (!s) { err = 1; goto beach; }
   fvec_t *vec = new_fvec(hop_size);
-
-  aubio_source_t* s = new_aubio_source(source_path, samplerate, hop_size);
-  if (!s) { err = 1; goto beach; }
 
   if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(s);
@@ -44 +45 @@
     n_frames / hop_size, source_path);
 
+  del_fvec (vec);
   del_aubio_source (s);
 beach:
-  del_fvec (vec);
-
   return err;
 }

tests/src/io/test-source_apple_audio.c

@@ -12 +12 @@
     err = 2;
     PRINT_ERR("not enough arguments\n");
-    PRINT_MSG("usage: %s <source_path> [samplerate]\n", argv[0]);
+    PRINT_MSG("read a wave file as a mono vector\n");
+    PRINT_MSG("usage: %s <source_path> [samplerate] [hop_size]\n", argv[0]);
+    PRINT_MSG("examples:\n");
+    PRINT_MSG(" - read file.wav at original samplerate\n");
+    PRINT_MSG("       %s file.wav\n", argv[0]);
+    PRINT_MSG(" - read file.wav at 32000Hz\n");
+    PRINT_MSG("       %s file.aif 32000\n", argv[0]);
+    PRINT_MSG(" - read file.wav at original samplerate with 4096 blocks\n");
+    PRINT_MSG("       %s file.wav 0 4096 \n", argv[0]);
     return err;
   }
 
 #if __APPLE__
-  uint_t samplerate = 32000;
+  uint_t samplerate = 0;
   uint_t hop_size = 256;
   uint_t n_frames = 0, read = 0;
   if ( argc == 3 ) samplerate = atoi(argv[2]);
+  if ( argc == 4 ) hop_size = atoi(argv[3]);
 
   char_t *source_path = argv[1];
 
+
+  aubio_source_apple_audio_t * s =
+    new_aubio_source_apple_audio(source_path, samplerate, hop_size);
+  if (!s) { err = 1; goto beach; }
   fvec_t *vec = new_fvec(hop_size);
-  aubio_source_apple_audio_t * s = new_aubio_source_apple_audio(source_path, samplerate, hop_size);
+
   if (samplerate == 0 ) samplerate = aubio_source_apple_audio_get_samplerate(s);
-
-  if (!s) { err = 1; goto beach; }
 
   do {
     aubio_source_apple_audio_do(s, vec, &read);
-    // fvec_print (vec);
+    fvec_print (vec);
     n_frames += read;
   } while ( read == hop_size );
 
+  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s\n", n_frames, samplerate,
+    n_frames / hop_size, source_path);
+
+  del_fvec (vec);
+  del_aubio_source_apple_audio (s);
 beach:
-  del_aubio_source_apple_audio (s);
-  del_fvec (vec);
 #else
   err = 3;

tests/src/io/test-source_sndfile.c

@@ -13 +13 @@
     err = 2;
     PRINT_ERR("not enough arguments\n");
-    PRINT_MSG("usage: %s <source_path> [samplerate]\n", argv[0]);
+    PRINT_MSG("read a wave file as a mono vector\n");
+    PRINT_MSG("usage: %s <source_path> [samplerate] [hop_size]\n", argv[0]);
+    PRINT_MSG("examples:\n");
+    PRINT_MSG(" - read file.wav at original samplerate\n");
+    PRINT_MSG("       %s file.wav\n", argv[0]);
+    PRINT_MSG(" - read file.wav at 32000Hz\n");
+    PRINT_MSG("       %s file.aif 32000\n", argv[0]);
+    PRINT_MSG(" - read file.wav at original samplerate with 4096 blocks\n");
+    PRINT_MSG("       %s file.wav 0 4096 \n", argv[0]);
     return err;
   }
@@ -22 +30 @@
   uint_t n_frames = 0, read = 0;
   if ( argc == 3 ) samplerate = atoi(argv[2]);
+  if ( argc == 4 ) hop_size = atoi(argv[3]);
 
   char_t *source_path = argv[1];
 
+
+  aubio_source_sndfile_t * s =
+    new_aubio_source_sndfile(source_path, samplerate, hop_size);
+  if (!s) { err = 1; goto beach; }
   fvec_t *vec = new_fvec(hop_size);
-  aubio_source_sndfile_t * s = new_aubio_source_sndfile(source_path, samplerate, hop_size);
-  if (!s) { err = 1; goto beach; }
+
   if (samplerate == 0 ) samplerate = aubio_source_sndfile_get_samplerate(s);
 
@@ -36 +48 @@
   } while ( read == hop_size );
 
+  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s\n", n_frames, samplerate,
+    n_frames / hop_size, source_path);
+
+  del_fvec (vec);
   del_aubio_source_sndfile (s);
 beach:
-  del_fvec (vec);
 #else
   err = 3;