Changeset 194ef6b

Timestamp:

Sep 25, 2009, 4:09:25 AM (15 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:

c423c3d

Parents:

d69e37d

Message:

ext/jackio.{c,h}: convert data from smpl_t to jack_default_audio_sample_t when needed

Location:

ext

Files:

• jackio.c (modified) (4 diffs)
• jackio.h (modified) (1 diff)

ext/jackio.c

@@ -18 +18 @@
 */
 
-#include "config.h"
-#ifdef HAVE_JACK
+#include <aubio.h>
+
+#if HAVE_JACK
 #include <jack/jack.h>
 #include "aubio_priv.h"
 #include "jackio.h"
 
-/*typedef jack_default_audio_sample_t jack_sample_t; */
-/* work with float, never tried in double */
-typedef smpl_t jack_sample_t;
+typedef jack_default_audio_sample_t jack_sample_t;
+
+#if !AUBIO_SINGLE_PRECISION
+#define AUBIO_JACK_MAX_FRAMES 4096
+#define AUBIO_JACK_NEEDS_CONVERSION
+#endif
 
 /**
@@ -42 +46 @@
   /** jack output buffer */
   jack_sample_t **obufs;
+#ifdef AUBIO_JACK_NEEDS_CONVERSION 
+  /** converted jack input buffer */
+  smpl_t **sibufs;
+  /** converted jack output buffer */
+  smpl_t **sobufs;
+#endif
   /** jack input channels */
   uint_t ichan;
@@ -139 +149 @@
   jack_setup->ibufs  = AUBIO_ARRAY(jack_sample_t*, ichan); 
   jack_setup->obufs  = AUBIO_ARRAY(jack_sample_t*, ochan); 
+#ifdef AUBIO_JACK_NEEDS_CONVERSION 
+  jack_setup->sibufs = AUBIO_ARRAY(smpl_t*, ichan); 
+  uint_t i;
+  for (i = 0; i < ichan; i++) {
+    jack_setup->sibufs[i] = AUBIO_ARRAY(smpl_t, AUBIO_JACK_MAX_FRAMES);
+  }
+  jack_setup->sobufs = AUBIO_ARRAY(smpl_t*, ochan); 
+  for (i = 0; i < ochan; i++) {
+    jack_setup->sobufs[i] = AUBIO_ARRAY(smpl_t, AUBIO_JACK_MAX_FRAMES);
+  }
+#endif
   return jack_setup;
 }
@@ -168 +189 @@
       (jack_sample_t *) jack_port_get_buffer (dev->oports[i], nframes);
   }
+#ifndef AUBIO_JACK_NEEDS_CONVERSION
   dev->callback(dev->ibufs,dev->obufs,nframes);
+#else
+  uint_t j;
+  for (j = 0; j < MIN(nframes, AUBIO_JACK_MAX_FRAMES); j++) {
+    for (i = 0; i < dev->ichan; i++) { 
+      dev->sibufs[i][j] = (smpl_t)dev->ibufs[i][j];
+    }
+  }
+  dev->callback(dev->sibufs, dev->sobufs, nframes);
+  for (j = 0; j < MIN(nframes, AUBIO_JACK_MAX_FRAMES); j++) {
+    for (i = 0; i < dev->ichan; i++) { 
+      dev->obufs[i][j] = (jack_sample_t)dev->sobufs[i][j];
+    }
+  }
+#endif
   return 0;
 }

ext/jackio.h

@@ -35 +35 @@
 typedef struct _aubio_jack_t aubio_jack_t;
 /** jack process function */
-typedef int (*aubio_process_func_t)(float **input, float **output, int
-    nframes);
+typedef int (*aubio_process_func_t)(smpl_t **input, 
+    smpl_t **output, int nframes);
 
 /** jack device creation function */