projects
/
aubio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7b711b3
)
src/onset/onset.c: improve default parameters
author
Paul Brossier
<piem@piem.org>
Sun, 26 Mar 2017 15:49:11 +0000
(17:49 +0200)
committer
Paul Brossier
<piem@piem.org>
Sun, 26 Mar 2017 15:49:11 +0000
(17:49 +0200)
src/onset/onset.c
patch
|
blob
|
history
diff --git
a/src/onset/onset.c
b/src/onset/onset.c
index
111ae29
..
5961c72
100644
(file)
--- a/
src/onset/onset.c
+++ b/
src/onset/onset.c
@@
-295,17
+295,23
@@
uint_t aubio_onset_set_default_parameters (aubio_onset_t * o, const char_t * ons
|| strcmp (onset_mode, "complex") == 0) {
aubio_onset_set_delay (o, 4.6 * o->hop_size);
aubio_onset_set_threshold (o, 0.15);
|| strcmp (onset_mode, "complex") == 0) {
aubio_onset_set_delay (o, 4.6 * o->hop_size);
aubio_onset_set_threshold (o, 0.15);
-
o->apply_compression = 1
;
-
o->lambda_compression = 1.
;
+
aubio_onset_set_awhitening(o, 1)
;
+
aubio_onset_set_compression (o, 1.)
;
} else if (strcmp (onset_mode, "phase") == 0) {
o->apply_compression = 0;
} else if (strcmp (onset_mode, "phase") == 0) {
o->apply_compression = 0;
- aubio_onset_set_a
daptive_
whitening (o, 0);
+ aubio_onset_set_awhitening (o, 0);
} else if (strcmp (onset_mode, "mkl") == 0) {
aubio_onset_set_threshold (o, 0.05);
} else if (strcmp (onset_mode, "mkl") == 0) {
aubio_onset_set_threshold (o, 0.05);
+ aubio_onset_set_awhitening(o, 1);
+ aubio_onset_set_compression (o, 0.02);
} else if (strcmp (onset_mode, "kl") == 0) {
aubio_onset_set_threshold (o, 0.35);
} else if (strcmp (onset_mode, "kl") == 0) {
aubio_onset_set_threshold (o, 0.35);
+ aubio_onset_set_awhitening(o, 1);
+ aubio_onset_set_compression (o, 0.02);
} else if (strcmp (onset_mode, "specflux") == 0) {
} else if (strcmp (onset_mode, "specflux") == 0) {
- aubio_onset_set_threshold (o, 0.4);
+ aubio_onset_set_threshold (o, 0.25);
+ aubio_onset_set_awhitening(o, 1);
+ aubio_onset_set_compression (o, 20.);
} else if (strcmp (onset_mode, "specdiff") == 0) {
} else {
AUBIO_WRN("onset: unknown spectral descriptor type %s, "
} else if (strcmp (onset_mode, "specdiff") == 0) {
} else {
AUBIO_WRN("onset: unknown spectral descriptor type %s, "