shithub: aubio

Info  •  Files  •  Log  •  Branches

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

--- a/src/io/source_sndfile.c

+++ b/src/io/source_sndfile.c

@@ -66,8 +66,16 @@

   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;

+  }

   s->hop_size = hop_size;

   s->channels = 1;

@@ -133,8 +141,8 @@

   return s;

 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;

 }

--- a/tests/src/io/test-source.c

+++ b/tests/src/io/test-source.c

@@ -27,10 +27,11 @@

   char_t *source_path = argv[1];

-  fvec_t *vec = new_fvec(hop_size);

-  aubio_source_t* s = new_aubio_source(source_path, samplerate, hop_size);

+  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);

   if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(s);

@@ -43,9 +44,8 @@

   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 (s);

 beach:

-  del_fvec (vec);

-

   return err;

 }

--- a/tests/src/io/test-source_apple_audio.c

+++ b/tests/src/io/test-source_apple_audio.c

@@ -11,33 +11,47 @@

   if (argc < 2) {

     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];

-  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);

+  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);

+  if (samplerate == 0 ) samplerate = aubio_source_apple_audio_get_samplerate(s);

+

   do {

     aubio_source_apple_audio_do(s, vec, &read);

-    // fvec_print (vec);

+    fvec_print (vec);

     n_frames += read;

   } while ( read == hop_size );

-beach:

-  del_aubio_source_apple_audio (s);

+  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:

 #else

   err = 3;

   PRINT_ERR("aubio was not compiled with aubio_source_apple_audio\n");

--- a/tests/src/io/test-source_sndfile.c

+++ b/tests/src/io/test-source_sndfile.c

@@ -12,7 +12,15 @@

   if (argc < 2) {

     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;

   }

@@ -21,12 +29,16 @@

   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];

-  fvec_t *vec = new_fvec(hop_size);

-  aubio_source_sndfile_t * s = new_aubio_source_sndfile(source_path, samplerate, hop_size);

+

+  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);

+

   if (samplerate == 0 ) samplerate = aubio_source_sndfile_get_samplerate(s);

   do {

@@ -35,9 +47,12 @@

     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_sndfile (s);

 beach:

-  del_fvec (vec);

 #else

   err = 3;

   PRINT_ERR("aubio was not compiled with aubio_source_sndfile\n");