Changeset f5adffe for tests/src/io/test-sink.c

Timestamp:

Dec 19, 2018, 9:49:26 PM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

5573a6b, 5e9bdca

Parents:

0e6ad10 (diff), 0045668 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/sink_vorbis

File:

• tests/src/io/test-sink.c (modified) (2 diffs)

tests/src/io/test-sink.c

@@ -22 +22 @@
   char_t *sink_path = argv[2];
 
+  aubio_source_t *src = NULL;
+  aubio_sink_t *snk = NULL;
+
   if ( argc >= 4 ) samplerate = atoi(argv[3]);
   if ( argc >= 5 ) hop_size = atoi(argv[4]);
 
   fvec_t *vec = new_fvec(hop_size);
+  if (!vec) { err = 1; goto failure; }
 
-  aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size);
-  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i);
+  src = new_aubio_source(source_path, samplerate, hop_size);
+  if (!src) { err = 1; goto failure; }
+  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(src);
 
-  aubio_sink_t *o = new_aubio_sink(sink_path, samplerate);
-
-  if (!vec || !i || !o) { err = 1; goto failure; }
+  snk = new_aubio_sink(sink_path, samplerate);
+  if (!snk) { err = 1; goto failure; }
 
   do {
-    aubio_source_do(i, vec, &read);
-    aubio_sink_do(o, vec, read);
+    aubio_source_do(src, vec, &read);
+    aubio_sink_do(snk, vec, read);
     n_frames += read;
   } while ( read == hop_size );
@@ -45 +49 @@
 
   // close sink now (optional)
-  aubio_sink_close(o);
+  aubio_sink_close(snk);
 
 failure:
-  if (o)
-    del_aubio_sink(o);
-  if (i)
-    del_aubio_source(i);
+  if (snk)
+    del_aubio_sink(snk);
+  if (src)
+    del_aubio_source(src);
   if (vec)
     del_fvec(vec);