shithub: aubio

Info  •  Files  •  Log  •  Branches

Merge branch 'develop' into avcodec

--- a/src/io/sink_sndfile.c

+++ b/src/io/sink_sndfile.c

@@ -70,6 +70,7 @@

   if (s->handle == NULL) {

     /* show libsndfile err msg */

     AUBIO_ERR("Failed opening %s. %s\n", s->path, sf_strerror (NULL));

+    AUBIO_FREE(s);

     return NULL;

   }	

@@ -78,6 +79,7 @@

   if (s->scratch_size >= MAX_SIZE * MAX_CHANNELS) {

     AUBIO_ERR("%d x %d exceeds maximum aubio_sink_sndfile buffer size %d\n",

         s->max_size, s->channels, MAX_CHANNELS * MAX_CHANNELS);

+    AUBIO_FREE(s);

     return NULL;

   }

   s->scratch_data = AUBIO_ARRAY(float,s->scratch_size);

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

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

@@ -8,24 +8,35 @@

   if (argc < 3) {

     err = 2;

     PRINT_ERR("not enough arguments\n");

-    PRINT_MSG("usage: %s <input_path> <output_path> [samplerate]\n", argv[0]);

+    PRINT_MSG("usage: %s <input_path> <output_path> [samplerate] [hop_size]\n", argv[0]);

     return err;

   }

-  uint_t samplerate = 44100;

-  uint_t hop_size = 512;

-  uint_t n_frames = 0, read = 0;

-

   char_t *source_path = argv[1];

   char_t *sink_path = argv[2];

-  if ( argc == 4 ) samplerate = atoi(argv[3]);

+  uint_t samplerate = 0;

+  uint_t hop_size = 256;

+  if ( argc >= 4 ) samplerate = atoi(argv[3]);

+  if ( argc >= 5 ) hop_size = atoi(argv[4]);

+  if ( argc >= 6 ) {

+    err = 2;

+    PRINT_ERR("too many arguments\n");

+    return err;

+  }

+

   fvec_t *vec = new_fvec(hop_size);

+  if (!vec) { err = 1; goto beach_fvec; }

+

   aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);

+  if (!i) { err = 1; goto beach_source; }

+

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

+

   aubio_sink_t *o = new_aubio_sink(sink_path, samplerate);

+  if (!o) { err = 1; goto beach_sink; }

-  if (!i || !o) { err = 1; goto beach; }

+  uint_t n_frames = 0, read = 0;

   do {

     aubio_source_do(i, vec, &read);

@@ -33,12 +44,15 @@

     n_frames += read;

   } while ( read == hop_size );

-  PRINT_MSG("wrote %d frames at %dHz from %s written to %s\n",

-      n_frames, samplerate, source_path, sink_path);

+  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s written to %s\n",

+      n_frames, samplerate, n_frames / hop_size,

+      source_path, sink_path);

-beach:

-  del_aubio_source(i);

   del_aubio_sink(o);

+beach_sink:

+  del_aubio_source(i);

+beach_source:

   del_fvec(vec);

+beach_fvec:

   return err;

 }