Changeset ce6186a

Timestamp:

Dec 8, 2013, 2:14:09 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

3826e0b

Parents:

fe6a393a

Message:

examples/aubio{trac,onset}.c: add silence option

Location:

examples

Files:

• aubionotes.c (modified) (1 diff)
• aubioonset.c (modified) (4 diffs)
• aubioquiet.c (modified) (1 diff)
• aubiotrack.c (modified) (2 diffs)
• parse_args.h (modified) (2 diffs)
• utils.c (modified) (1 diff)

examples/aubionotes.c

@@ -58 +58 @@
 
   /* curlevel is negatif or 1 if silence */
-  smpl_t curlevel = aubio_level_detection(ibuf, silence);
+  smpl_t curlevel = aubio_level_detection(ibuf, silence_threshold);
   if (fvec_read_sample(onset, 0)) {
     /* test for silence */

examples/aubioonset.c

@@ -28 +28 @@
 aubio_wavetable_t *wavetable;
 fvec_t *onset;
+smpl_t is_onset;
+uint_t is_silence = 0.;
 
 void
@@ -33 +35 @@
   fvec_zeros(obuf);
   aubio_onset_do (o, ibuf, onset);
-  if ( fvec_read_sample(onset, 0) ) {
+  if (silence_threshold != -90.)
+    is_silence = aubio_silence_detection(ibuf, silence_threshold);
+  is_onset = fvec_read_sample(onset, 0);
+  if ( is_onset && !is_silence ) {
     aubio_wavetable_play ( wavetable );
   } else {
@@ -47 +52 @@
 process_print (void)
 {
-  smpl_t onset_found = fvec_read_sample (onset, 0);
-  if (onset_found) {
+  if ( is_onset && !is_silence ) {
     outmsg ("%f\n", aubio_onset_get_last_s (o) );
   }
@@ -60 +64 @@
   verbmsg ("buffer_size: %d, ", buffer_size);
   verbmsg ("hop_size: %d, ", hop_size);
+  verbmsg ("threshold: %f, ", silence_threshold);
   verbmsg ("threshold: %f\n", onset_threshold);
 

examples/aubioquiet.c

@@ -26 +26 @@
 void process_block(fvec_t * ibuf, fvec_t * obuf) {
   fvec_zeros (obuf);
-  if (aubio_silence_detection(ibuf, silence)==1) {
+  if (aubio_silence_detection(ibuf, silence_threshold)==1) {
     if (wassilence==1) issilence = 1;
     else issilence = 2;

examples/aubiotrack.c

@@ -28 +28 @@
 aubio_wavetable_t *wavetable;
 fvec_t * tempo_out;
-smpl_t istactus = 0;
-smpl_t isonset = 0;
+smpl_t is_beat = 0;
+smpl_t is_onset = 0;
+uint_t is_silence = 0.;
 
 void process_block(fvec_t * ibuf, fvec_t *obuf) {
   aubio_tempo_do (tempo, ibuf, tempo_out);
-  istactus = fvec_read_sample (tempo_out, 0);
-  isonset = fvec_read_sample (tempo_out, 1);
+  is_beat = fvec_read_sample (tempo_out, 0);
+  is_onset = fvec_read_sample (tempo_out, 1);
+  if (silence_threshold != -90.)
+    is_silence = aubio_silence_detection(ibuf, silence_threshold);
   fvec_zeros (obuf);
-  if (istactus > 0.) {
+  if ( is_beat && !is_silence ) {
     aubio_wavetable_play ( wavetable );
   } else {
@@ -48 +51 @@
 
 void process_print (void) {
-  if (istactus) {
+  if ( is_beat && !is_silence ) {
     outmsg("%f\n", aubio_tempo_get_last_s(tempo) );
   }
-  //if (isonset && verbose)
+  //if ( is_onset )
   //  outmsg(" \t \t%f\n",(blocks)*hop_size/(float)samplerate);
 }

examples/parse_args.h

@@ -38 +38 @@
 extern char_t * tempo_method;
 // more general stuff
-extern smpl_t silence;
+extern smpl_t silence_threshold;
 extern uint_t mix_input;
 
@@ -184 +184 @@
         break;
       case 's':                /* silence threshold */
-        silence = (smpl_t) atof (optarg);
+        silence_threshold = (smpl_t) atof (optarg);
         break;
       case 'm':                /* mix_input flag */

examples/utils.c

@@ -51 +51 @@
 char_t * tempo_method = "default";
 // more general stuff
-smpl_t silence = -90.;
+smpl_t silence_threshold = -90.;
 uint_t mix_input = 0;