Changeset 77db425 for tests/src

Timestamp:

Nov 26, 2013, 4:18:57 AM (10 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:

2dbcafa

Parents:

18f14f9

Message:

src/tempo/tempo.c: fix for different samplerates

Location:

tests/src/tempo

Files:

• test-beattracking.c (modified) (1 diff)
• test-tempo.c (modified) (2 diffs)

tests/src/tempo/test-beattracking.c

@@ -12 +12 @@
 
   // create beattracking object
-  aubio_beattracking_t * tempo  = new_aubio_beattracking(win_s);
+  aubio_beattracking_t * tempo  = new_aubio_beattracking(win_s, 256, 44100);
 
   smpl_t bpm, confidence;

tests/src/tempo/test-tempo.c

@@ -9 +9 @@
     PRINT_ERR("not enough arguments\n");
     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("usage: %s <source_path> [samplerate] [win_size] [hop_size]\n", argv[0]);
     return err;
   }
   uint_t samplerate = 0;
-  uint_t win_s = 1024; // window size
-  uint_t hop_size = win_s / 4;
+  if ( argc >= 3 ) samplerate = atoi(argv[2]);
+  uint_t win_size = 1024; // window size
+  if ( argc >= 4 ) win_size = atoi(argv[3]);
+  uint_t hop_size = win_size / 4;
+  if ( argc >= 5 ) hop_size = atoi(argv[4]);
   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];
@@ -30 +31 @@
 
   // create tempo object
-  aubio_tempo_t * o = new_aubio_tempo("default", win_s, hop_size, samplerate);
+  aubio_tempo_t * o = new_aubio_tempo("default", win_size, hop_size, samplerate);
 
   do {