src/spectral/specdesc.{c,h}: rename aubio_onsetdetection to aubio_specdesc

Paul Brossier committed 17 years ago

Commit 31907fd1 parent bafe71d9 files · +94 −94Browse files

Unified · Split

9 files

python/aubio/aubioclass.py +5 −5
src/Makefile.am +1 −1
src/aubio.h +1 −1
src/onset/onset.c +7 −7
src/onset/onset.h +1 −1
src/spectral/specdesc.c +44 −44
src/spectral/specdesc.h +6 −6
src/tempo/tempo.c +7 −7
tests/src/test-onsetdetection.c +22 −22

@@ -68,13 +68,13 @@ class pvoc: · 67 unmodified lines
68	68	aubio_pvoc_rdo(self.pv,tc(),tf())
69	69
70	70	class onsetdetection:
71		− """ class for aubio_onsetdetection """
	71	+ """ class for aubio_specdesc """
72	72	def __init__(self,mode,buf,chan):
73		− self.od = new_aubio_onsetdetection(mode,buf,chan)
	73	+ self.od = new_aubio_specdesc(mode,buf,chan)
74	74	def do(self,tc,tf):
75		− aubio_onsetdetection_do(self.od,tc(),tf())
	75	+ aubio_specdesc_do(self.od,tc(),tf())
76	76	def __del__(self):
77		− del_aubio_onsetdetection(self.od)
	77	+ del_aubio_specdesc(self.od)
78	78
79	79	class peakpick:
80	80	""" class for aubio_peakpicker """
@@ -91,7 +91,7 @@ class peakpick: · 10 unmodified lines
91	91	del_aubio_peakpicker(self.pp)
92	92
93	93	class onsetpick:
94		− """ superclass for aubio_pvoc + aubio_onsetdetection + aubio_peakpicker """
	94	+ """ superclass for aubio_pvoc + aubio_specdesc + aubio_peakpicker """
95	95	def __init__(self,bufsize,hopsize,channels,myvec,threshold,mode='dual',derivate=False,dcthreshold=0):
96	96	self.myfft = cvec(bufsize,channels)
97	97	self.pv = pvoc(bufsize,hopsize,channels)

src/Makefile.am+1−1

@@ -22,6 +22,7 @@ nobase_pkginclude_HEADERS = \ · 21 unmodified lines
22	22	spectral/phasevoc.h \
23	23	spectral/fft.h \
24	24	spectral/tss.h \
	25	+ spectral/specdesc.h \
25	26	spectral/spectral_centroid.h \
26	27	pitch/pitch.h \
27	28	pitch/pitchmcomb.h \
@@ -30,7 +31,6 @@ nobase_pkginclude_HEADERS = \ · 2 unmodified lines
30	31	pitch/pitchfcomb.h \
31	32	pitch/pitchyinfft.h \
32	33	onset/onset.h \
33		− onset/onsetdetection.h \
34	34	onset/peakpick.h \
35	35	tempo/tempo.h \
36	36	tempo/beattracking.h

src/aubio.h+1−1

@@ -165,6 +165,7 @@ extern "C" · 164 unmodified lines
165	165	#include "spectral/fft.h"
166	166	#include "spectral/phasevoc.h"
167	167	#include "spectral/mfcc.h"
	168	+#include "spectral/specdesc.h"
168	169	#include "pitch/pitch.h"
169	170	#include "onset/onset.h"
170	171	#include "tempo/tempo.h"
@@ -182,7 +183,6 @@ extern "C" · 11 unmodified lines
182	183	#include "pitch/pitchyinfft.h"
183	184	#include "pitch/pitchschmitt.h"
184	185	#include "pitch/pitchfcomb.h"
185		−#include "onset/onsetdetection.h"
186	186	#include "spectral/spectral_centroid.h"
187	187	#include "onset/peakpick.h"
188	188	#include "tempo/beattracking.h"

src/onset/onset.c+7−7

@@ -21,7 +21,7 @@ · 20 unmodified lines
21	21	#include "aubio_priv.h"
22	22	#include "fvec.h"
23	23	#include "cvec.h"
24		−#include "onset/onsetdetection.h"
	24	+#include "spectral/specdesc.h"
25	25	#include "spectral/phasevoc.h"
26	26	#include "onset/peakpick.h"
27	27	#include "mathutils.h"
@@ -30,7 +30,7 @@ · 2 unmodified lines
30	30	/** structure to store object state */
31	31	struct _aubio_onset_t {
32	32	aubio_pvoc_t * pv; /*< phase vocoder /
33		− aubio_onsetdetection_t * od; /*< onset detection /
	33	+ aubio_specdesc_t * od; /*< onset detection /
34	34	aubio_peakpicker_t * pp; /*< peak picker /
35	35	cvec_t * fftgrain; /*< phase vocoder output /
36	36	fvec_t * of; /*< onset detection function /
@@ -48,9 +48,9 @@ void aubio_onset_do (aubio_onset_t o, fvec_t input, fvec_t * onset) · 11 unmodified lines
48	48	smpl_t wasonset = 0;
49	49	uint_t i;
50	50	aubio_pvoc_do (o->pv,input, o->fftgrain);
51		− aubio_onsetdetection_do (o->od,o->fftgrain, o->of);
	51	+ aubio_specdesc_do (o->od,o->fftgrain, o->of);
52	52	/*if (usedoubled) {
53		− aubio_onsetdetection_do (o2,fftgrain, onset2);
	53	+ aubio_specdesc_do (o2,fftgrain, onset2);
54	54	onset->data[0][0] *= onset2->data[0][0];
55	55	}*/
56	56	aubio_peakpicker_do(o->pp, o->of, onset);
@@ -108,11 +108,11 @@ aubio_onset_t * new_aubio_onset (char_t * onset_mode, · 51 unmodified lines
108	108	o->pv = new_aubio_pvoc(buf_size, hop_size, channels);
109	109	o->pp = new_aubio_peakpicker(channels);
110	110	aubio_peakpicker_set_threshold (o->pp, o->threshold);
111		− o->od = new_aubio_onsetdetection(onset_mode,buf_size,channels);
	111	+ o->od = new_aubio_specdesc(onset_mode,buf_size,channels);
112	112	o->fftgrain = new_cvec(buf_size,channels);
113	113	o->of = new_fvec(1, channels);
114	114	/*if (usedoubled) {
115		− o2 = new_aubio_onsetdetection(onset_type2,buffer_size,channels);
	115	+ o2 = new_aubio_specdesc(onset_type2,buffer_size,channels);
116	116	onset2 = new_fvec(1 , channels);
117	117	}*/
118	118	return o;
@@ -120,7 +120,7 @@ aubio_onset_t * new_aubio_onset (char_t * onset_mode, · 1 unmodified line
120	120
121	121	void del_aubio_onset (aubio_onset_t *o)
122	122	{
123		− del_aubio_onsetdetection(o->od);
	123	+ del_aubio_specdesc(o->od);
124	124	del_aubio_peakpicker(o->pp);
125	125	del_aubio_pvoc(o->pv);
126	126	del_fvec(o->of);

src/onset/onset.h+1−1

@@ -46,7 +46,7 @@ typedef struct _aubio_onset_t aubio_onset_t; · 45 unmodified lines
46	46
47	47	/** create onset detection object
48	48
49		− \param onset_mode onset detection type as specified in onsetdetection.h
	49	+ \param onset_mode onset detection type as specified in specdesc.h
50	50	\param buf_size buffer size for phase vocoder
51	51	\param hop_size hop size for phase vocoder
52	52	\param channels number of channels

src/spectral/specdesc.crenamed from src/onset/onsetdetection.c+44−44

@@ -22,20 +22,20 @@ · 21 unmodified lines
22	22	#include "fvec.h"
23	23	#include "cvec.h"
24	24	#include "spectral/fft.h"
	25	+#include "spectral/specdesc.h"
25	26	#include "mathutils.h"
26	27	#include "utils/hist.h"
27		−#include "onset/onsetdetection.h"
28	28
29	29	/** Energy based onset detection function
30	30
31	31	This function calculates the local energy of the input spectral frame.
32	32
33		− \param o onset detection object as returned by new_aubio_onsetdetection()
	33	+ \param o onset detection object as returned by new_aubio_specdesc()
34	34	\param fftgrain input spectral frame
35	35	\param onset output onset detection function
36	36
37	37	*/
38		−void aubio_onsetdetection_energy(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	38	+void aubio_specdesc_energy(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
39	39	/** High Frequency Content onset detection function
40	40
41	41	This method computes the High Frequency Content (HFC) of the input spectral
@@ -44,24 +44,24 @@ void aubio_onsetdetection_energy(aubio_onsetdetection_t o, cvec_t fftgrain, f · 2 unmodified lines
44	44	Paul Masri. Computer modeling of Sound for Transformation and Synthesis of
45	45	Musical Signal. PhD dissertation, University of Bristol, UK, 1996.
46	46
47		− \param o onset detection object as returned by new_aubio_onsetdetection()
	47	+ \param o onset detection object as returned by new_aubio_specdesc()
48	48	\param fftgrain input spectral frame
49	49	\param onset output onset detection function
50	50
51	51	*/
52		−void aubio_onsetdetection_hfc(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	52	+void aubio_specdesc_hfc(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
53	53	/** Complex Domain Method onset detection function
54	54
55	55	Christopher Duxbury, Mike E. Davies, and Mark B. Sandler. Complex domain
56	56	onset detection for musical signals. In Proceedings of the Digital Audio
57	57	Effects Conference, DAFx-03, pages 90-93, London, UK, 2003.
58	58
59		− \param o onset detection object as returned by new_aubio_onsetdetection()
	59	+ \param o onset detection object as returned by new_aubio_specdesc()
60	60	\param fftgrain input spectral frame
61	61	\param onset output onset detection function
62	62
63	63	*/
64		−void aubio_onsetdetection_complex(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	64	+void aubio_specdesc_complex(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
65	65	/** Phase Based Method onset detection function
66	66
67	67	Juan-Pablo Bello, Mike P. Davies, and Mark B. Sandler. Phase-based note onset
@@ -69,60 +69,60 @@ void aubio_onsetdetection_complex(aubio_onsetdetection_t o, cvec_t fftgrain, · 1 unmodified line
69	69	Conference on Acoustics Speech and Signal Processing, pages 441444,
70	70	Hong-Kong, 2003.
71	71
72		− \param o onset detection object as returned by new_aubio_onsetdetection()
	72	+ \param o onset detection object as returned by new_aubio_specdesc()
73	73	\param fftgrain input spectral frame
74	74	\param onset output onset detection function
75	75
76	76	*/
77		−void aubio_onsetdetection_phase(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	77	+void aubio_specdesc_phase(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
78	78	/** Spectral difference method onset detection function
79	79
80	80	Jonhatan Foote and Shingo Uchihashi. The beat spectrum: a new approach to
81	81	rhythm analysis. In IEEE International Conference on Multimedia and Expo
82	82	(ICME 2001), pages 881884, Tokyo, Japan, August 2001.
83	83
84		− \param o onset detection object as returned by new_aubio_onsetdetection()
	84	+ \param o onset detection object as returned by new_aubio_specdesc()
85	85	\param fftgrain input spectral frame
86	86	\param onset output onset detection function
87	87
88	88	*/
89		−void aubio_onsetdetection_specdiff(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	89	+void aubio_specdesc_specdiff(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
90	90	/** Kullback-Liebler onset detection function
91	91
92	92	Stephen Hainsworth and Malcom Macleod. Onset detection in music audio
93	93	signals. In Proceedings of the International Computer Music Conference
94	94	(ICMC), Singapore, 2003.
95	95
96		− \param o onset detection object as returned by new_aubio_onsetdetection()
	96	+ \param o onset detection object as returned by new_aubio_specdesc()
97	97	\param fftgrain input spectral frame
98	98	\param onset output onset detection function
99	99
100	100	*/
101		−void aubio_onsetdetection_kl(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	101	+void aubio_specdesc_kl(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
102	102	/** Modified Kullback-Liebler onset detection function
103	103
104	104	Paul Brossier, ``Automatic annotation of musical audio for interactive
105	105	systems'', Chapter 2, Temporal segmentation, PhD thesis, Centre for Digital
106	106	music, Queen Mary University of London, London, UK, 2006.
107	107
108		− \param o onset detection object as returned by new_aubio_onsetdetection()
	108	+ \param o onset detection object as returned by new_aubio_specdesc()
109	109	\param fftgrain input spectral frame
110	110	\param onset output onset detection function
111	111
112	112	*/
113		−void aubio_onsetdetection_mkl(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	113	+void aubio_specdesc_mkl(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
114	114	/** Spectral Flux
115	115
116	116	Simon Dixon, Onset Detection Revisited, in ``Proceedings of the 9th
117	117	International Conference on Digital Audio Effects'' (DAFx-06), Montreal,
118	118	Canada, 2006.
119	119
120		− \param o onset detection object as returned by new_aubio_onsetdetection()
	120	+ \param o onset detection object as returned by new_aubio_specdesc()
121	121	\param fftgrain input spectral frame
122	122	\param onset output onset detection function
123	123
124	124	*/
125		−void aubio_onsetdetection_specflux(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	125	+void aubio_specdesc_specflux(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
126	126
127	127	/** onsetdetection types */
128	128	typedef enum {
@@ -135,13 +135,13 @@ typedef enum { · 6 unmodified lines
135	135	aubio_onset_mkl, /*< modified Kullback Liebler /
136	136	aubio_onset_specflux, /*< spectral flux /
137	137	aubio_onset_default = aubio_onset_hfc, /*< default mode, set to hfc /
138		−} aubio_onsetdetection_type;
	138	+} aubio_specdesc_type;
139	139
140	140	/** structure to store object state */
141		−struct _aubio_onsetdetection_t {
142		− aubio_onsetdetection_type onset_type; /*< onset detection type /
143		− /** Pointer to aubio_onsetdetection_<type> function */
144		− void (funcpointer)(aubio_onsetdetection_t o,
	141	+struct _aubio_specdesc_t {
	142	+ aubio_specdesc_type onset_type; /*< onset detection type /
	143	+ /** Pointer to aubio_specdesc_<type> function */
	144	+ void (funcpointer)(aubio_specdesc_t o,
145	145	cvec_t * fftgrain, fvec_t * onset);
146	146	smpl_t threshold; /*< minimum norm threshold for phase and specdiff /
147	147	fvec_t oldmag; /< previous norm vector /
@@ -153,7 +153,7 @@ struct _aubio_onsetdetection_t { · 5 unmodified lines
153	153
154	154
155	155	/* Energy based onset detection function */
156		−void aubio_onsetdetection_energy (aubio_onsetdetection_t *o UNUSED,
	156	+void aubio_specdesc_energy (aubio_specdesc_t *o UNUSED,
157	157	cvec_t * fftgrain, fvec_t * onset) {
158	158	uint_t i,j;
159	159	for (i=0;i<fftgrain->channels;i++) {
@@ -165,7 +165,7 @@ void aubio_onsetdetection_energy (aubio_onsetdetection_t *o UNUSED, · 5 unmodified lines
165	165	}
166	166
167	167	/* High Frequency Content onset detection function */
168		−void aubio_onsetdetection_hfc(aubio_onsetdetection_t *o UNUSED,
	168	+void aubio_specdesc_hfc(aubio_specdesc_t *o UNUSED,
169	169	cvec_t * fftgrain, fvec_t * onset){
170	170	uint_t i,j;
171	171	for (i=0;i<fftgrain->channels;i++) {
@@ -178,7 +178,7 @@ void aubio_onsetdetection_hfc(aubio_onsetdetection_t *o UNUSED, · 6 unmodified lines
178	178
179	179
180	180	/* Complex Domain Method onset detection function */
181		−void aubio_onsetdetection_complex (aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset) {
	181	+void aubio_specdesc_complex (aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset) {
182	182	uint_t i, j;
183	183	uint_t nbins = fftgrain->length;
184	184	for (i=0;i<fftgrain->channels; i++) {
@@ -203,7 +203,7 @@ void aubio_onsetdetection_complex (aubio_onsetdetection_t o, cvec_t fftgrain, · 18 unmodified lines
203	203
204	204
205	205	/* Phase Based Method onset detection function */
206		−void aubio_onsetdetection_phase(aubio_onsetdetection_t *o,
	206	+void aubio_specdesc_phase(aubio_specdesc_t *o,
207	207	cvec_t * fftgrain, fvec_t * onset){
208	208	uint_t i, j;
209	209	uint_t nbins = fftgrain->length;
@@ -235,7 +235,7 @@ void aubio_onsetdetection_phase(aubio_onsetdetection_t *o, · 25 unmodified lines
235	235	}
236	236
237	237	/* Spectral difference method onset detection function */
238		−void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o,
	238	+void aubio_specdesc_specdiff(aubio_specdesc_t *o,
239	239	cvec_t * fftgrain, fvec_t * onset){
240	240	uint_t i, j;
241	241	uint_t nbins = fftgrain->length;
@@ -266,7 +266,7 @@ void aubio_onsetdetection_specdiff(aubio_onsetdetection_t *o, · 24 unmodified lines
266	266	/* Kullback Liebler onset detection function
267	267	* note we use ln(1+Xn/(Xn-1+0.0001)) to avoid
268	268	* negative (1.+) and infinite values (+1.e-10) */
269		−void aubio_onsetdetection_kl(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset){
	269	+void aubio_specdesc_kl(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset){
270	270	uint_t i,j;
271	271	for (i=0;i<fftgrain->channels;i++) {
272	272	onset->data[i][0] = 0.;
@@ -282,7 +282,7 @@ void aubio_onsetdetection_kl(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_ · 9 unmodified lines
282	282	/* Modified Kullback Liebler onset detection function
283	283	* note we use ln(1+Xn/(Xn-1+0.0001)) to avoid
284	284	* negative (1.+) and infinite values (+1.e-10) */
285		−void aubio_onsetdetection_mkl(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset){
	285	+void aubio_specdesc_mkl(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset){
286	286	uint_t i,j;
287	287	for (i=0;i<fftgrain->channels;i++) {
288	288	onset->data[i][0] = 0.;
@@ -295,7 +295,7 @@ void aubio_onsetdetection_mkl(aubio_onsetdetection_t o, cvec_t fftgrain, fvec · 6 unmodified lines
295	295	}
296	296
297	297	/* Spectral flux */
298		−void aubio_onsetdetection_specflux(aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset){
	298	+void aubio_specdesc_specflux(aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset){
299	299	uint_t i, j;
300	300	for (i=0;i<fftgrain->channels;i++) {
301	301	onset->data[i][0] = 0.;
@@ -309,7 +309,7 @@ void aubio_onsetdetection_specflux(aubio_onsetdetection_t o, cvec_t fftgrain, · 7 unmodified lines
309	309
310	310	/* Generic function pointing to the choosen one */
311	311	void
312		−aubio_onsetdetection_do (aubio_onsetdetection_t o, cvec_t fftgrain,
	312	+aubio_specdesc_do (aubio_specdesc_t o, cvec_t fftgrain,
313	313	fvec_t * onset) {
314	314	o->funcpointer(o,fftgrain,onset);
315	315	}
@@ -317,12 +317,12 @@ aubio_onsetdetection_do (aubio_onsetdetection_t o, cvec_t fftgrain, · 1 unmodified line
317	317	/* Allocate memory for an onset detection
318	318	* depending on the choosen type, allocate memory as needed
319	319	*/
320		−aubio_onsetdetection_t *
321		−new_aubio_onsetdetection (char_t * onset_mode,
	320	+aubio_specdesc_t *
	321	+new_aubio_specdesc (char_t * onset_mode,
322	322	uint_t size, uint_t channels){
323		− aubio_onsetdetection_t * o = AUBIO_NEW(aubio_onsetdetection_t);
	323	+ aubio_specdesc_t * o = AUBIO_NEW(aubio_specdesc_t);
324	324	uint_t rsize = size/2+1;
325		− aubio_onsetdetection_type onset_type;
	325	+ aubio_specdesc_type onset_type;
326	326	if (strcmp (onset_mode, "energy") == 0)
327	327	onset_type = aubio_onset_energy;
328	328	else if (strcmp (onset_mode, "specdiff") == 0)
@@ -388,28 +388,28 @@ new_aubio_onsetdetection (char_t * onset_mode, · 59 unmodified lines
388	388
389	389	switch(onset_type) {
390	390	case aubio_onset_energy:
391		− o->funcpointer = aubio_onsetdetection_energy;
	391	+ o->funcpointer = aubio_specdesc_energy;
392	392	break;
393	393	case aubio_onset_hfc:
394		− o->funcpointer = aubio_onsetdetection_hfc;
	394	+ o->funcpointer = aubio_specdesc_hfc;
395	395	break;
396	396	case aubio_onset_complex:
397		− o->funcpointer = aubio_onsetdetection_complex;
	397	+ o->funcpointer = aubio_specdesc_complex;
398	398	break;
399	399	case aubio_onset_phase:
400		− o->funcpointer = aubio_onsetdetection_phase;
	400	+ o->funcpointer = aubio_specdesc_phase;
401	401	break;
402	402	case aubio_onset_specdiff:
403		− o->funcpointer = aubio_onsetdetection_specdiff;
	403	+ o->funcpointer = aubio_specdesc_specdiff;
404	404	break;
405	405	case aubio_onset_kl:
406		− o->funcpointer = aubio_onsetdetection_kl;
	406	+ o->funcpointer = aubio_specdesc_kl;
407	407	break;
408	408	case aubio_onset_mkl:
409		− o->funcpointer = aubio_onsetdetection_mkl;
	409	+ o->funcpointer = aubio_specdesc_mkl;
410	410	break;
411	411	case aubio_onset_specflux:
412		− o->funcpointer = aubio_onsetdetection_specflux;
	412	+ o->funcpointer = aubio_specdesc_specflux;
413	413	break;
414	414	default:
415	415	break;
@@ -418,7 +418,7 @@ new_aubio_onsetdetection (char_t * onset_mode, · 2 unmodified lines
418	418	return o;
419	419	}
420	420
421		−void del_aubio_onsetdetection (aubio_onsetdetection_t *o){
	421	+void del_aubio_specdesc (aubio_specdesc_t *o){
422	422	switch(o->onset_type) {
423	423	/* for both energy and hfc, only fftgrain->norm is required */
424	424	case aubio_onset_energy:

src/spectral/specdesc.hrenamed from src/onset/onsetdetection.h+6−6

@@ -40,17 +40,17 @@ extern "C" { · 39 unmodified lines
40	40	#endif
41	41
42	42	/** onsetdetection structure */
43		−typedef struct _aubio_onsetdetection_t aubio_onsetdetection_t;
	43	+typedef struct _aubio_specdesc_t aubio_specdesc_t;
44	44	/** execute onset detection function on a spectral frame
45	45
46	46	Generic function to compute onset detection.
47	47
48		− \param o onset detection object as returned by new_aubio_onsetdetection()
	48	+ \param o onset detection object as returned by new_aubio_specdesc()
49	49	\param fftgrain input signal spectrum as computed by aubio_pvoc_do
50	50	\param onset output vector (one sample long, to send to the peak picking)
51	51
52	52	*/
53		−void aubio_onsetdetection_do (aubio_onsetdetection_t o, cvec_t fftgrain, fvec_t * onset);
	53	+void aubio_specdesc_do (aubio_specdesc_t o, cvec_t fftgrain, fvec_t * onset);
54	54	/** creation of an onset detection object
55	55
56	56	\param type onset detection mode
@@ -58,13 +58,13 @@ void aubio_onsetdetection_do (aubio_onsetdetection_t o, cvec_t fftgrain, fvec · 1 unmodified line
58	58	\param channels number of input channels
59	59
60	60	*/
61		−aubio_onsetdetection_t * new_aubio_onsetdetection(char_t * onset_mode, uint_t buf_size, uint_t channels);
	61	+aubio_specdesc_t * new_aubio_specdesc(char_t * onset_mode, uint_t buf_size, uint_t channels);
62	62	/** deletion of an onset detection object
63	63
64		− \param o onset detection object as returned by new_aubio_onsetdetection()
	64	+ \param o onset detection object as returned by new_aubio_specdesc()
65	65
66	66	*/
67		−void del_aubio_onsetdetection(aubio_onsetdetection_t *o);
	67	+void del_aubio_specdesc(aubio_specdesc_t *o);
68	68
69	69	#ifdef __cplusplus
70	70	}

src/tempo/tempo.c+7−7

@@ -21,7 +21,7 @@ · 20 unmodified lines
21	21	#include "aubio_priv.h"
22	22	#include "fvec.h"
23	23	#include "cvec.h"
24		−#include "onset/onsetdetection.h"
	24	+#include "spectral/specdesc.h"
25	25	#include "tempo/beattracking.h"
26	26	#include "spectral/phasevoc.h"
27	27	#include "onset/peakpick.h"
@@ -30,7 +30,7 @@ · 2 unmodified lines
30	30
31	31	/* structure to store object state */
32	32	struct _aubio_tempo_t {
33		− aubio_onsetdetection_t * od; /** onset detection */
	33	+ aubio_specdesc_t * od; /** onset detection */
34	34	aubio_pvoc_t * pv; /** phase vocoder */
35	35	aubio_peakpicker_t * pp; /** peak picker */
36	36	aubio_beattracking_t * bt; /** beat tracking */
@@ -55,9 +55,9 @@ void aubio_tempo_do(aubio_tempo_t o, fvec_t input, fvec_t * tempo) · 18 unmodified lines
55	55	uint_t winlen = o->winlen;
56	56	uint_t step = o->step;
57	57	aubio_pvoc_do (o->pv, input, o->fftgrain);
58		− aubio_onsetdetection_do (o->od, o->fftgrain, o->of);
	58	+ aubio_specdesc_do (o->od, o->fftgrain, o->of);
59	59	/*if (usedoubled) {
60		− aubio_onsetdetection_do(o2,fftgrain, onset2);
	60	+ aubio_specdesc_do(o2,fftgrain, onset2);
61	61	onset->data[0][0] *= onset2->data[0][0];
62	62	}*/
63	63	/* execute every overlap_sizestep /
@@ -120,13 +120,13 @@ aubio_tempo_t * new_aubio_tempo (char_t * onset_mode, · 56 unmodified lines
120	120	o->pv = new_aubio_pvoc(buf_size, hop_size, channels);
121	121	o->pp = new_aubio_peakpicker(channels);
122	122	aubio_peakpicker_set_threshold (o->pp, o->threshold);
123		− o->od = new_aubio_onsetdetection(onset_mode,buf_size,channels);
	123	+ o->od = new_aubio_specdesc(onset_mode,buf_size,channels);
124	124	o->of = new_fvec(1, channels);
125	125	o->bt = new_aubio_beattracking(o->winlen,channels);
126	126	o->onset = new_fvec(1, channels);
127	127	o->peek = new_fvec(3, channels);
128	128	/*if (usedoubled) {
129		− o2 = new_aubio_onsetdetection(type_onset2,buffer_size,channels);
	129	+ o2 = new_aubio_specdesc(type_onset2,buffer_size,channels);
130	130	onset2 = new_fvec(1 , channels);
131	131	}*/
132	132	return o;
@@ -142,7 +142,7 @@ smpl_t aubio_tempo_get_confidence(aubio_tempo_t *o) { · 9 unmodified lines
142	142
143	143	void del_aubio_tempo (aubio_tempo_t *o)
144	144	{
145		− del_aubio_onsetdetection(o->od);
	145	+ del_aubio_specdesc(o->od);
146	146	del_aubio_beattracking(o->bt);
147	147	del_aubio_peakpicker(o->pp);
148	148	del_aubio_pvoc(o->pv);

tests/src/test-onsetdetection.c+22−22

@@ -11,35 +11,35 @@ main () · 10 unmodified lines
11	11	cvec_t in = new_cvec (win_s, channels); / input buffer */
12	12	fvec_t out = new_fvec (1, channels); / input buffer */
13	13
14		− aubio_onsetdetection_t *o;
	14	+ aubio_specdesc_t *o;
15	15
16		− o = new_aubio_onsetdetection ("energy", win_s, channels);
17		− aubio_onsetdetection_do (o, in, out);
18		− del_aubio_onsetdetection (o);
	16	+ o = new_aubio_specdesc ("energy", win_s, channels);
	17	+ aubio_specdesc_do (o, in, out);
	18	+ del_aubio_specdesc (o);
19	19
20		− o = new_aubio_onsetdetection ("energy", win_s, channels);
21		− aubio_onsetdetection_do (o, in, out);
22		− del_aubio_onsetdetection (o);
	20	+ o = new_aubio_specdesc ("energy", win_s, channels);
	21	+ aubio_specdesc_do (o, in, out);
	22	+ del_aubio_specdesc (o);
23	23
24		− o = new_aubio_onsetdetection ("hfc", win_s, channels);
25		− aubio_onsetdetection_do (o, in, out);
26		− del_aubio_onsetdetection (o);
	24	+ o = new_aubio_specdesc ("hfc", win_s, channels);
	25	+ aubio_specdesc_do (o, in, out);
	26	+ del_aubio_specdesc (o);
27	27
28		− o = new_aubio_onsetdetection ("complex", win_s, channels);
29		− aubio_onsetdetection_do (o, in, out);
30		− del_aubio_onsetdetection (o);
	28	+ o = new_aubio_specdesc ("complex", win_s, channels);
	29	+ aubio_specdesc_do (o, in, out);
	30	+ del_aubio_specdesc (o);
31	31
32		− o = new_aubio_onsetdetection ("phase", win_s, channels);
33		− aubio_onsetdetection_do (o, in, out);
34		− del_aubio_onsetdetection (o);
	32	+ o = new_aubio_specdesc ("phase", win_s, channels);
	33	+ aubio_specdesc_do (o, in, out);
	34	+ del_aubio_specdesc (o);
35	35
36		− o = new_aubio_onsetdetection ("kl", win_s, channels);
37		− aubio_onsetdetection_do (o, in, out);
38		− del_aubio_onsetdetection (o);
	36	+ o = new_aubio_specdesc ("kl", win_s, channels);
	37	+ aubio_specdesc_do (o, in, out);
	38	+ del_aubio_specdesc (o);
39	39
40		− o = new_aubio_onsetdetection ("mkl", win_s, channels);
41		− aubio_onsetdetection_do (o, in, out);
42		− del_aubio_onsetdetection (o);
	40	+ o = new_aubio_specdesc ("mkl", win_s, channels);
	41	+ aubio_specdesc_do (o, in, out);
	42	+ del_aubio_specdesc (o);
43	43
44	44	del_cvec (in);
45	45	del_fvec (out);

src/spectral/specdesc.{c,h}: rename aubio_onsetdetection to aubio_specdesc

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code