Changeset 70585a5 for examples

Timestamp:

Nov 21, 2007, 4:53:13 PM (17 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:

66a1b955

Parents:

b050e8e (diff), 15b97d9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge from main branch

Location:

examples

Files:

• aubioonset.c (modified) (2 diffs)
• utils.c (modified) (4 diffs)
• utils.h (modified) (1 diff)

examples/aubioonset.c

@@ -72 +72 @@
       if (isonset && output_filename == NULL) {
         if(frames >= 4) {
-          outmsg("%f\n",(frames-4)*overlap_size/(float)samplerate);
-        } else if (frames < 4) {
+          outmsg("%f\n",(frames-frames_delay)*overlap_size/(float)samplerate);
+        } else if (frames < frames_delay) {
           outmsg("%f\n",0.);
         }
@@ -80 +80 @@
 
 int main(int argc, char **argv) {
+  frames_delay = 4;
   examples_common_init(argc,argv);
   examples_common_process(aubio_process,process_print);

examples/utils.c

@@ -22 +22 @@
 void save_data (void);
 void restore_data(lash_config_t * lash_config);
+void flush_process(aubio_process_func_t process_func, aubio_print_func_t print);
 pthread_t lash_thread;
 #endif /* LASH_SUPPORT */
@@ -33 +34 @@
 int usejack = 0;
 int usedoubled = 1;
+int frames_delay = 0;
 
 
@@ -395 +397 @@
 
     debug("Processed %d frames of %d samples.\n", frames, buffer_size);
+
+    flush_process(process_func, print);
     del_aubio_sndfile(file);
 
@@ -403 +407 @@
 }
 
+void flush_process(aubio_process_func_t process_func, aubio_print_func_t print){
+  uint i,j;
+  for (i = 0; i < channels; i++) {
+    for (j = 0; j < obuf->length; j++) {
+      fvec_write_sample(obuf,0.,i,j);
+    }
+  }
+  for (i = 0; (signed)i < frames_delay; i++) {
+    process_func(ibuf->data, obuf->data, overlap_size);
+    print(); 
+  }
+}
 
 

examples/utils.h

@@ -42 +42 @@
 extern int usejack;
 extern int usedoubled;
+extern int frames_delay;
 extern unsigned int median;
 extern const char * output_filename;