Changeset 8212692

Timestamp:

Jan 9, 2010, 3:49:40 PM (14 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:

066433d

Parents:

4c01c0f (diff), f650860 (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:

pull from master

Files:

• examples/Makefile.am (modified) (3 diffs)
• examples/utils.c (modified) (2 diffs)
• src/spectral/specdesc.c (modified) (1 diff)
• tests/src/test-pitch.c (added)

examples/Makefile.am

@@ -11 +11 @@
 
 noinst_PROGRAMS = \
+        aubiopitch
         aubioquiet
 
@@ -20 +21 @@
 aubionotes_SOURCES = aubionotes.c $(COMMON_SOURCE_FILES)
 aubiotrack_SOURCES = aubiotrack.c $(COMMON_SOURCE_FILES)
+aubiopitch_SOURCES = aubiopitch.c $(COMMON_SOURCE_FILES)
 aubioquiet_SOURCES = aubioquiet.c $(COMMON_SOURCE_FILES)
 aubiomfcc_SOURCES = aubiomfcc.c $(COMMON_SOURCE_FILES)
@@ -26 +28 @@
 aubionotes_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
 aubiotrack_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
+aubiopitch_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
 aubioquiet_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@
 aubiomfcc_LDADD = @SNDFILE_LIBS@ @JACK_LIBS@

examples/utils.c

@@ -207 +207 @@
   parse_args (argc, argv);
 
-  woodblock = new_fvec (overlap_size);
+  if (!usejack) {
+    debug ("Opening files ...\n");
+    file = new_aubio_sndfile_ro (input_filename);
+    if (file == NULL) {
+      outmsg ("Could not open input file %s.\n", input_filename);
+      exit (1);
+    }
+    if (verbose)
+      aubio_sndfile_info (file);
+    samplerate = aubio_sndfile_samplerate (file);
+    if (output_filename != NULL)
+      fileout = new_aubio_sndfile_wo (file, output_filename);
+  }
+#ifdef HAVE_LASH
+  else {
+    aubio_lash_client = lash_init (lash_args, argv[0],
+        LASH_Config_Data_Set | LASH_Terminal, LASH_PROTOCOL (2, 0));
+    if (!aubio_lash_client) {
+      fprintf (stderr, "%s: could not initialise lash\n", __FUNCTION__);
+    }
+    /* tell the lash server our client id */
+    if (lash_enabled (aubio_lash_client)) {
+      lash_event_t *event =
+          (lash_event_t *) lash_event_new_with_type (LASH_Client_Name);
+      lash_event_set_string (event, "aubio");
+      lash_send_event (aubio_lash_client, event);
+      pthread_create (&lash_thread, NULL, lash_thread_main, NULL);
+    }
+  }
+#endif /* HAVE_LASH */
+
+  woodblock = new_fvec (overlap_size, channels);
   if (output_filename || usejack) {
     /* dummy assignement to keep egcs happy */
@@ -220 +251 @@
   if (onsetfile) {
     /* read the output sound once */
-    aubio_sndfile_read_mono (onsetfile, overlap_size, woodblock);
-  }
-
-  if (!usejack) {
-    debug ("Opening files ...\n");
-    file = new_aubio_sndfile_ro (input_filename);
-    if (file == NULL) {
-      outmsg ("Could not open input file %s.\n", input_filename);
-      exit (1);
-    }
-    if (verbose)
-      aubio_sndfile_info (file);
-    samplerate = aubio_sndfile_samplerate (file);
-    if (output_filename != NULL)
-      fileout = new_aubio_sndfile_wo (file, output_filename);
-  }
-#ifdef HAVE_LASH
-  else {
-    aubio_lash_client = lash_init (lash_args, argv[0],
-        LASH_Config_Data_Set | LASH_Terminal, LASH_PROTOCOL (2, 0));
-    if (!aubio_lash_client) {
-      fprintf (stderr, "%s: could not initialise lash\n", __FUNCTION__);
-    }
-    /* tell the lash server our client id */
-    if (lash_enabled (aubio_lash_client)) {
-      lash_event_t *event =
-          (lash_event_t *) lash_event_new_with_type (LASH_Client_Name);
-      lash_event_set_string (event, "aubio");
-      lash_send_event (aubio_lash_client, event);
-      pthread_create (&lash_thread, NULL, lash_thread_main, NULL);
-    }
-  }
-#endif /* HAVE_LASH */
-
-  uint_t i;
-  ibuf = new_fvec (overlap_size);
-  obuf = new_fvec (overlap_size);
+    aubio_sndfile_read (onsetfile, overlap_size, woodblock);
+  }
+
+  ibuf = new_fvec (overlap_size, channels);
+  obuf = new_fvec (overlap_size, channels);
 
 }

src/spectral/specdesc.c

@@ -274 +274 @@
       onset_type = aubio_onset_default;
   else {
-      AUBIO_ERR("unknown spectral descriptor type %s.\n", onset_mode);
+      AUBIO_ERR("unknown spectral descriptor type %s, using default.\n", onset_mode);
       onset_type = aubio_onset_default;
   }