Changeset 447c673 for tests


Ignore:
Timestamp:
Dec 6, 2013, 8:38:31 PM (6 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, pitchshift, sampler, timestretch, yinfft+
Children:
7816f2b
Parents:
919139b
Message:

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

Location:
tests/src/io
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • tests/src/io/test-source.c

    r919139b r447c673  
    2828  char_t *source_path = argv[1];
    2929
     30
     31  aubio_source_t* s =
     32    new_aubio_source(source_path, samplerate, hop_size);
     33  if (!s) { err = 1; goto beach; }
    3034  fvec_t *vec = new_fvec(hop_size);
    31 
    32   aubio_source_t* s = new_aubio_source(source_path, samplerate, hop_size);
    33   if (!s) { err = 1; goto beach; }
    3435
    3536  if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(s);
     
    4445    n_frames / hop_size, source_path);
    4546
     47  del_fvec (vec);
    4648  del_aubio_source (s);
    4749beach:
    48   del_fvec (vec);
    49 
    5050  return err;
    5151}
  • tests/src/io/test-source_apple_audio.c

    r919139b r447c673  
    1212    err = 2;
    1313    PRINT_ERR("not enough arguments\n");
    14     PRINT_MSG("usage: %s <source_path> [samplerate]\n", argv[0]);
     14    PRINT_MSG("read a wave file as a mono vector\n");
     15    PRINT_MSG("usage: %s <source_path> [samplerate] [hop_size]\n", argv[0]);
     16    PRINT_MSG("examples:\n");
     17    PRINT_MSG(" - read file.wav at original samplerate\n");
     18    PRINT_MSG("       %s file.wav\n", argv[0]);
     19    PRINT_MSG(" - read file.wav at 32000Hz\n");
     20    PRINT_MSG("       %s file.aif 32000\n", argv[0]);
     21    PRINT_MSG(" - read file.wav at original samplerate with 4096 blocks\n");
     22    PRINT_MSG("       %s file.wav 0 4096 \n", argv[0]);
    1523    return err;
    1624  }
    1725
    1826#if __APPLE__
    19   uint_t samplerate = 32000;
     27  uint_t samplerate = 0;
    2028  uint_t hop_size = 256;
    2129  uint_t n_frames = 0, read = 0;
    2230  if ( argc == 3 ) samplerate = atoi(argv[2]);
     31  if ( argc == 4 ) hop_size = atoi(argv[3]);
    2332
    2433  char_t *source_path = argv[1];
    2534
     35
     36  aubio_source_apple_audio_t * s =
     37    new_aubio_source_apple_audio(source_path, samplerate, hop_size);
     38  if (!s) { err = 1; goto beach; }
    2639  fvec_t *vec = new_fvec(hop_size);
    27   aubio_source_apple_audio_t * s = new_aubio_source_apple_audio(source_path, samplerate, hop_size);
     40
    2841  if (samplerate == 0 ) samplerate = aubio_source_apple_audio_get_samplerate(s);
    29 
    30   if (!s) { err = 1; goto beach; }
    3142
    3243  do {
    3344    aubio_source_apple_audio_do(s, vec, &read);
    34     // fvec_print (vec);
     45    fvec_print (vec);
    3546    n_frames += read;
    3647  } while ( read == hop_size );
    3748
     49  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s\n", n_frames, samplerate,
     50    n_frames / hop_size, source_path);
     51
     52  del_fvec (vec);
     53  del_aubio_source_apple_audio (s);
    3854beach:
    39   del_aubio_source_apple_audio (s);
    40   del_fvec (vec);
    4155#else
    4256  err = 3;
  • tests/src/io/test-source_sndfile.c

    r919139b r447c673  
    1313    err = 2;
    1414    PRINT_ERR("not enough arguments\n");
    15     PRINT_MSG("usage: %s <source_path> [samplerate]\n", argv[0]);
     15    PRINT_MSG("read a wave file as a mono vector\n");
     16    PRINT_MSG("usage: %s <source_path> [samplerate] [hop_size]\n", argv[0]);
     17    PRINT_MSG("examples:\n");
     18    PRINT_MSG(" - read file.wav at original samplerate\n");
     19    PRINT_MSG("       %s file.wav\n", argv[0]);
     20    PRINT_MSG(" - read file.wav at 32000Hz\n");
     21    PRINT_MSG("       %s file.aif 32000\n", argv[0]);
     22    PRINT_MSG(" - read file.wav at original samplerate with 4096 blocks\n");
     23    PRINT_MSG("       %s file.wav 0 4096 \n", argv[0]);
    1624    return err;
    1725  }
     
    2230  uint_t n_frames = 0, read = 0;
    2331  if ( argc == 3 ) samplerate = atoi(argv[2]);
     32  if ( argc == 4 ) hop_size = atoi(argv[3]);
    2433
    2534  char_t *source_path = argv[1];
    2635
     36
     37  aubio_source_sndfile_t * s =
     38    new_aubio_source_sndfile(source_path, samplerate, hop_size);
     39  if (!s) { err = 1; goto beach; }
    2740  fvec_t *vec = new_fvec(hop_size);
    28   aubio_source_sndfile_t * s = new_aubio_source_sndfile(source_path, samplerate, hop_size);
    29   if (!s) { err = 1; goto beach; }
     41
    3042  if (samplerate == 0 ) samplerate = aubio_source_sndfile_get_samplerate(s);
    3143
     
    3648  } while ( read == hop_size );
    3749
     50  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s\n", n_frames, samplerate,
     51    n_frames / hop_size, source_path);
     52
     53  del_fvec (vec);
    3854  del_aubio_source_sndfile (s);
    3955beach:
    40   del_fvec (vec);
    4156#else
    4257  err = 3;
Note: See TracChangeset for help on using the changeset viewer.