Changeset 9f060d1


Ignore:
Timestamp:
Aug 12, 2015, 6:28:17 PM (5 years ago)
Author:
Paul Brossier <piem@piem.org>
Branches:
feature/autosink, feature/constantq, feature/pitchshift, feature/pydocstrings, feature/timestretch, master, sampler
Children:
299dbfd
Parents:
5c58032
Message:

src/spectral/awhitening.c: add adaptive whitening

Location:
src
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • src/aubio.h

    r5c58032 r9f060d1  
    179179#include "spectral/mfcc.h"
    180180#include "spectral/specdesc.h"
     181#include "spectral/awhitening.h"
    181182#include "spectral/tss.h"
    182183#include "pitch/pitch.h"
  • src/onset/onset.c

    r5c58032 r9f060d1  
    2424#include "spectral/specdesc.h"
    2525#include "spectral/phasevoc.h"
     26#include "spectral/awhitening.h"
    2627#include "onset/peakpicker.h"
    2728#include "mathutils.h"
     
    4344  uint_t total_frames;          /**< total number of frames processed since the beginning */
    4445  uint_t last_onset;            /**< last detected onset location, in frames */
     46
     47  uint_t apply_adaptive_whitening;
     48  aubio_spectral_whitening_t *spectral_whitening;
    4549};
    4650
     
    5054  smpl_t isonset = 0;
    5155  aubio_pvoc_do (o->pv,input, o->fftgrain);
     56  /*
     57  if (apply_filtering) {
     58  }
     59  if (apply_compression) {
     60  }
     61  */
     62  if (o->apply_adaptive_whitening) {
     63    aubio_spectral_whitening_do(o->spectral_whitening, o->fftgrain);
     64  }
    5265  aubio_specdesc_do (o->od, o->fftgrain, o->desc);
    5366  aubio_peakpicker_do(o->pp, o->desc, onset);
     
    210223  aubio_onset_set_silence(o, -70.);
    211224
     225  o->spectral_whitening = new_aubio_spectral_whitening(buf_size, hop_size, samplerate);
     226  o->apply_adaptive_whitening = 1;
     227
    212228  /* initialize internal variables */
    213229  o->last_onset = 0;
     
    222238void del_aubio_onset (aubio_onset_t *o)
    223239{
     240  del_aubio_spectral_whitening(o->spectral_whitening);
    224241  del_aubio_specdesc(o->od);
    225242  del_aubio_peakpicker(o->pp);
Note: See TracChangeset for help on using the changeset viewer.