source: src/onset/onset.c @ 56ef7e1

feature/autosinkfeature/cnnfeature/cnn_orgfeature/constantqfeature/crepefeature/crepe_orgfeature/pitchshiftfeature/pydocstringsfeature/timestretchfix/ffmpeg5pitchshiftsamplertimestretchyinfft+
Last change on this file since 56ef7e1 was 56ef7e1, checked in by Paul Brossier <piem@piem.org>, 14 years ago

Change peakpicker to match API specs, make quadint per channel

  • src/mathutils.c
    • add per channel mean and median
    • update moving thres and adapt_thres accordingly
    • change quadint unused span argument to a channel argument
  • src/onset/onset.c:
    • make wasonset a vector for multi channel, use new peakpicker
  • src/onset/peakpick.c:
    • update peakpicker do for multi channeling
  • src/pitch/: update use to fvec_quadint
  • src/tempo/beattracking.c: update calls to fvec_quadint
  • src/tempo/tempo.c: update peakpicker usage
  • tests/src/test-peakpick.c: update peakpicker usage
  • Property mode set to 100644
File size: 3.9 KB
Line 
1/*
2   Copyright (C) 2006 Paul Brossier
3
4   This program is free software; you can redistribute it and/or modify
5   it under the terms of the GNU General Public License as published by
6   the Free Software Foundation; either version 2 of the License, or
7   (at your option) any later version.
8
9   This program is distributed in the hope that it will be useful,
10   but WITHOUT ANY WARRANTY; without even the implied warranty of
11   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
12   GNU General Public License for more details.
13
14   You should have received a copy of the GNU General Public License
15   along with this program; if not, write to the Free Software
16   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
17
18*/
19
20#include "aubio_priv.h"
21#include "fvec.h"
22#include "cvec.h"
23#include "onset/onsetdetection.h"
24#include "spectral/phasevoc.h"
25#include "onset/peakpick.h"
26#include "mathutils.h"
27#include "onset/onset.h"
28
29/** structure to store object state */
30struct _aubio_onset_t {
31  aubio_pvoc_t * pv;            /**< phase vocoder */
32  aubio_onsetdetection_t * od;  /**< onset detection */ 
33  aubio_peakpicker_t * pp;      /**< peak picker */
34  cvec_t * fftgrain;            /**< phase vocoder output */
35  fvec_t * of;                  /**< onset detection function */
36  smpl_t threshold;             /**< onset peak picking threshold */
37  smpl_t silence;               /**< silence threhsold */
38  uint_t minioi;                /**< minimum inter onset interval */
39  fvec_t * wasonset;            /**< number of frames since last onset */
40  uint_t samplerate;            /**< sampling rate of the input signal */
41};
42
43/* execute onset detection function on iput buffer */
44void aubio_onset_do (aubio_onset_t *o, fvec_t * input, fvec_t * onset)
45{
46  smpl_t isonset = 0;
47  smpl_t wasonset = 0;
48  uint_t i;
49  aubio_pvoc_do (o->pv,input, o->fftgrain);
50  aubio_onsetdetection_do (o->od,o->fftgrain, o->of);
51  /*if (usedoubled) {
52    aubio_onsetdetection_do (o2,fftgrain, onset2);
53    onset->data[0][0] *= onset2->data[0][0];
54  }*/
55  aubio_peakpicker_do(o->pp, o->of, onset);
56  for (i = 0; i < input->channels; i++) {
57  isonset = onset->data[i][0];
58  wasonset = o->wasonset->data[i][0];
59  if (isonset > 0.) {
60    if (aubio_silence_detection(input, o->silence)==1) {
61      isonset  = 0;
62      wasonset++;
63    } else {
64      if (wasonset > o->minioi) {
65        wasonset = 0;
66      } else {
67        isonset  = 0;
68        wasonset++;
69      }
70    }
71  } else {
72    wasonset++;
73  }
74  o->wasonset->data[i][0] = wasonset;
75  onset->data[i][0] = isonset;
76  }
77  return;
78}
79
80uint_t aubio_onset_set_silence(aubio_onset_t * o, smpl_t silence) {
81  o->silence = silence;
82  return AUBIO_OK;
83}
84
85uint_t aubio_onset_set_threshold(aubio_onset_t * o, smpl_t threshold) {
86  o->threshold = threshold;
87  aubio_peakpicker_set_threshold(o->pp, o->threshold);
88  return AUBIO_OK;
89}
90
91uint_t aubio_onset_set_minioi(aubio_onset_t * o, uint_t minioi) {
92  o->minioi = minioi;
93  return AUBIO_OK;
94}
95
96/* Allocate memory for an onset detection */
97aubio_onset_t * new_aubio_onset (char_t * onset_mode, 
98    uint_t buf_size, uint_t hop_size, uint_t channels, uint_t samplerate)
99{
100  aubio_onset_t * o = AUBIO_NEW(aubio_onset_t);
101  /** set some default parameter */
102  o->threshold = 0.3;
103  o->minioi    = 4;
104  o->silence   = -70;
105  o->wasonset  = new_fvec(1, channels);
106  o->samplerate = samplerate;
107  o->pv = new_aubio_pvoc(buf_size, hop_size, channels);
108  o->pp = new_aubio_peakpicker(channels);
109  aubio_peakpicker_set_threshold (o->pp, o->threshold);
110  o->od = new_aubio_onsetdetection(onset_mode,buf_size,channels);
111  o->fftgrain = new_cvec(buf_size,channels);
112  o->of = new_fvec(1, channels);
113  /*if (usedoubled)    {
114    o2 = new_aubio_onsetdetection(onset_type2,buffer_size,channels);
115    onset2 = new_fvec(1 , channels);
116  }*/
117  return o;
118}
119
120void del_aubio_onset (aubio_onset_t *o)
121{
122  del_aubio_onsetdetection(o->od);
123  del_aubio_peakpicker(o->pp);
124  del_aubio_pvoc(o->pv);
125  del_fvec(o->of);
126  del_fvec(o->wasonset);
127  del_cvec(o->fftgrain);
128  AUBIO_FREE(o);
129}
Note: See TracBrowser for help on using the repository browser.