Changeset dec789b


Ignore:
Timestamp:
Dec 6, 2018, 1:51:35 PM (12 months ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/pitchshift, feature/timestretch
Children:
78a564b
Parents:
3a96d3d (diff), dd47431 (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/pitchshift

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • src/pitch/pitchspecacf.c

    r3a96d3d rdec789b  
    9393  del_fvec (p->sqrmag);
    9494  del_fvec (p->fftout);
     95  del_fvec (p->acf);
    9596  AUBIO_FREE (p);
    9697}
  • src/spectral/awhitening.c

    r3a96d3d rdec789b  
    4444{
    4545  uint_t i = 0;
    46   for (i = 0; i < o->peak_values->length; i++) {
     46  uint_t length = MIN(fftgrain->length, o->peak_values->length);
     47  for (i = 0; i < length; i++) {
    4748    smpl_t tmp = MAX(o->r_decay * o->peak_values->data[i], o->floor);
    4849    o->peak_values->data[i] = MAX(fftgrain->norm[i], tmp);
  • src/utils/hist.c

    r3a96d3d rdec789b  
    4545  uint_t i;
    4646  if ((sint_t)nelems <= 0) {
     47    AUBIO_FREE(s);
    4748    return NULL;
    4849  }
  • tests/src/spectral/test-awhitening.c

    r3a96d3d rdec789b  
    4242
    4343  aubio_pvoc_t *pv = new_aubio_pvoc(win_size, hop_size);
     44  if (!pv) { err = 1; goto beach_pvoc; }
    4445
    4546  aubio_spectral_whitening_t *awhitening =
    4647    new_aubio_spectral_whitening (win_size, hop_size, samplerate);
     48  if (!awhitening) { err = 1; goto beach_awhitening; }
    4749
    4850  aubio_spectral_whitening_set_relax_time(awhitening, 20.);
     
    7274      source_path, sink_path);
    7375
     76  del_aubio_spectral_whitening(awhitening);
     77beach_awhitening:
     78  del_aubio_pvoc(pv);
     79beach_pvoc:
    7480  del_aubio_sink(o);
    7581beach_sink:
     
    7783beach_source:
    7884  del_fvec(vec);
     85  del_fvec(out);
     86  del_fvec(scale);
     87  del_cvec(fftgrain);
    7988beach_fvec:
    8089  return err;
  • tests/src/test-mathutils.c

    r3a96d3d rdec789b  
    101101  fvec_set_window(window, "rectangle");
    102102  fvec_print(window);
     103  del_fvec(window);
    103104
    104105  window_size /= 2.;
Note: See TracChangeset for help on using the changeset viewer.