ref: 9f68f113664ff064949992ff605896be3857986a
parent: d7ac23fa5767fd3b35ff4cc8dfe7c172cd99bff2
author: Paul Brossier <piem@piem.org>
date: Sat Feb 22 18:13:26 EST 2014
tests/src/io/test-sink*: improve, unify
--- a/tests/src/io/test-sink.c
+++ b/tests/src/io/test-sink.c
@@ -12,11 +12,13 @@
return err;
}
+ uint_t samplerate = 0;
+ uint_t hop_size = 512;
+ uint_t n_frames = 0, read = 0;
+
char_t *source_path = argv[1];
char_t *sink_path = argv[2];
- 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 ) {@@ -35,8 +37,6 @@
aubio_sink_t *o = new_aubio_sink(sink_path, samplerate);
if (!o) { err = 1; goto beach_sink; }-
- uint_t n_frames = 0, read = 0;
do {aubio_source_do(i, vec, &read);
--- a/tests/src/io/test-sink_apple_audio.c
+++ b/tests/src/io/test-sink_apple_audio.c
@@ -12,7 +12,7 @@
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;
}
@@ -23,15 +23,26 @@
char_t *source_path = argv[1];
char_t *sink_path = argv[2];
- if ( argc == 4 ) samplerate = atoi(argv[3]);
+ 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_apple_audio_t *o = new_aubio_sink_apple_audio(sink_path, samplerate);
+ if (!o) { err = 1; goto beach_sink; }- if (!i || !o) { err = 1; goto beach; }-
do {aubio_source_do(i, vec, &read);
aubio_sink_apple_audio_do(o, vec, read);
@@ -38,13 +49,16 @@
n_frames += read;
} while ( read == hop_size );
- PRINT_MSG("%d frames read from %s\n written to %s at %dHz\n",- n_frames, source_path, sink_path, samplerate);
+ 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_apple_audio(o);
+beach_sink:
+ del_aubio_source(i);
+beach_source:
del_fvec(vec);
+beach_fvec:
#else
err = 3;
PRINT_ERR("aubio was not compiled with aubio_source_apple_audio\n");--- a/tests/src/io/test-sink_sndfile.c
+++ b/tests/src/io/test-sink_sndfile.c
@@ -13,7 +13,7 @@
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;
}
@@ -24,28 +24,42 @@
char_t *source_path = argv[1];
char_t *sink_path = argv[2];
- if ( argc == 4 ) samplerate = atoi(argv[3]);
+ 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);
- aubio_source_sndfile_t * i = new_aubio_source_sndfile(source_path, samplerate, hop_size);
- if (samplerate == 0 ) samplerate = aubio_source_sndfile_get_samplerate(i);
- aubio_sink_sndfile_t * o = new_aubio_sink_sndfile(sink_path, samplerate);
+ if (!vec) { err = 1; goto beach_fvec; }- if (!i || !o) { err = 1; goto beach; }+ 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_sndfile_t *o = new_aubio_sink_sndfile(sink_path, samplerate);
+ if (!o) { err = 1; goto beach_sink; }+
do {- aubio_source_sndfile_do(i, vec, &read);
+ aubio_source_do(i, vec, &read);
aubio_sink_sndfile_do(o, vec, read);
n_frames += read;
} while ( read == hop_size );
- PRINT_MSG("%d frames read from %s\n written to %s at %dHz\n",- n_frames, source_path, sink_path, samplerate);
+ 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_sndfile(i);
del_aubio_sink_sndfile(o);
+beach_sink:
+ del_aubio_source(i);
+beach_source:
del_fvec(vec);
+beach_fvec:
#else
err = 3;
PRINT_ERR("aubio was not compiled with aubio_source_sndfile\n");--- a/tests/src/io/test-sink_wavwrite.c
+++ b/tests/src/io/test-sink_wavwrite.c
@@ -12,7 +12,7 @@
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;
}
@@ -23,15 +23,26 @@
char_t *source_path = argv[1];
char_t *sink_path = argv[2];
- if ( argc == 4 ) samplerate = atoi(argv[3]);
+ 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_wavwrite_t *o = new_aubio_sink_wavwrite(sink_path, samplerate);
+ if (!o) { err = 1; goto beach_sink; }- if (!i || !o) { err = 1; goto beach; }-
do {aubio_source_do(i, vec, &read);
aubio_sink_wavwrite_do(o, vec, read);
@@ -38,13 +49,16 @@
n_frames += read;
} while ( read == hop_size );
- PRINT_MSG("%d frames read from %s\n written to %s at %dHz\n",- n_frames, source_path, sink_path, samplerate);
+ 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_wavwrite(o);
+beach_sink:
+ del_aubio_source(i);
+beach_source:
del_fvec(vec);
+beach_fvec:
#else
err = 3;
PRINT_ERR("aubio was not compiled with aubio_sink_wavwrite\n");--
⑨