Changeset 222b176

Timestamp:

Feb 23, 2014, 4:56:54 PM (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:

870ad70

Parents:

af97786

Message:

src/io/sink_apple_audio.h: add do_multi, preset_samplerate, preset_channels, get_samplerate, and get_channels

Files:

• src/io/sink_apple_audio.c (modified) (7 diffs)
• src/io/sink_apple_audio.h (modified) (4 diffs)
• tests/src/io/test-sink_apple_audio-multi.c (added)

src/io/sink_apple_audio.c

@@ -1 +1 @@
 /*
-  Copyright (C) 2012 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2012-2014 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -25 +25 @@
 #include "aubio_priv.h"
 #include "fvec.h"
+#include "fmat.h"
 #include "io/sink_apple_audio.h"
 
@@ -39 +40 @@
 char_t *getPrintableOSStatusError(char_t *str, OSStatus error);
 
+uint_t aubio_sink_apple_audio_open(aubio_sink_apple_audio_t *s);
+
 #define MAX_SIZE 4096 // the maximum number of frames that can be written at a time
 
@@ -55 +58 @@
 aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(char_t * uri, uint_t samplerate) {
   aubio_sink_apple_audio_t * s = AUBIO_NEW(aubio_sink_apple_audio_t);
-  s->samplerate = samplerate;
-  s->channels = 1;
   s->path = uri;
   s->max_frames = MAX_SIZE;
   s->async = true;
+
+  s->samplerate = 0;
+  s->channels = 0;
+
+  // negative samplerate given, abort
+  if ((sint_t)samplerate < 0) goto beach;
+  // zero samplerate given. do not open yet
+  if ((sint_t)samplerate == 0) return s;
+
+  s->samplerate = samplerate;
+  s->channels = 1;
+
+  if (aubio_sink_apple_audio_open(s) != AUBIO_OK) {
+    // open failed, abort
+    goto beach;
+  }
+
+  return s;
+beach:
+  AUBIO_FREE(s);
+  return NULL;
+}
+
+uint_t aubio_sink_apple_audio_preset_samplerate(aubio_sink_apple_audio_t *s, uint_t samplerate)
+{
+  if ((sint_t)(samplerate) <= 0) return AUBIO_FAIL;
+  s->samplerate = samplerate;
+  // automatically open when both samplerate and channels have been set
+  if (s->samplerate != 0 && s->channels != 0) {
+    return aubio_sink_apple_audio_open(s);
+  }
+  return AUBIO_OK;
+}
+
+uint_t aubio_sink_apple_audio_preset_channels(aubio_sink_apple_audio_t *s, uint_t channels)
+{
+  if ((sint_t)(channels) <= 0) return AUBIO_FAIL;
+  s->channels = channels;
+  // automatically open when both samplerate and channels have been set
+  if (s->samplerate != 0 && s->channels != 0) {
+    return aubio_sink_apple_audio_open(s);
+  }
+  return AUBIO_OK;
+}
+
+uint_t aubio_sink_apple_audio_get_samplerate(aubio_sink_apple_audio_t *s)
+{
+  return s->samplerate;
+}
+
+uint_t aubio_sink_apple_audio_get_channels(aubio_sink_apple_audio_t *s)
+{
+  return s->channels;
+}
+
+uint_t aubio_sink_apple_audio_open(aubio_sink_apple_audio_t *s) {
+
+  if (s->samplerate == 0 || s->channels == 0) return AUBIO_FAIL;
 
   AudioStreamBasicDescription clientFormat;
@@ -74 +133 @@
 
   AudioFileTypeID fileType = kAudioFileWAVEType;
-  CFURLRef fileURL = getURLFromPath(uri);
+  CFURLRef fileURL = getURLFromPath(s->path);
   bool overwrite = true;
   OSStatus err = noErr;
@@ -91 +150 @@
     goto beach;
   }
-  return s;
+  return AUBIO_OK;
 
 beach:
-  AUBIO_FREE(s);
-  return NULL;
+  return AUBIO_FAIL;
 }
 
@@ -142 +200 @@
 }
 
+void aubio_sink_apple_audio_do_multi(aubio_sink_apple_audio_t * s, fmat_t * write_data, uint_t write) {
+  OSStatus err = noErr;
+  UInt32 c, v;
+  short *data = (short*)s->bufferList.mBuffers[0].mData;
+  if (write > s->max_frames) {
+    AUBIO_WRN("sink_apple_audio: trying to write %d frames, max %d\n", write, s->max_frames);
+    write = s->max_frames;
+  }
+  smpl_t **buf = write_data->data;
+
+  if (buf) {
+      for (c = 0; c < s->channels; c++) {
+          for (v = 0; v < write; v++) {
+              data[v * s->channels + c] =
+                  FLOAT_TO_SHORT(buf[c][v]);
+          }
+      }
+  }
+  if (s->async) {
+    err = ExtAudioFileWriteAsync(s->audioFile, write, &s->bufferList);
+
+    if (err) {
+      char_t errorstr[20];
+      AUBIO_ERROR("sink_apple_audio: error while writing %s "
+          "in ExtAudioFileWriteAsync (%s), switching to sync\n", s->path,
+          getPrintableOSStatusError(errorstr, err));
+      s->async = false;
+    } else {
+      return;
+    }
+
+  } else {
+    err = ExtAudioFileWrite(s->audioFile, write, &s->bufferList);
+
+    if (err) {
+      char_t errorstr[20];
+      AUBIO_ERROR("sink_apple_audio: error while writing %s "
+          "in ExtAudioFileWrite (%s)\n", s->path,
+          getPrintableOSStatusError(errorstr, err));
+    }
+  }
+  return;
+}
+
 uint_t aubio_sink_apple_audio_close(aubio_sink_apple_audio_t * s) {
   OSStatus err = noErr;

src/io/sink_apple_audio.h

@@ -1 +1 @@
 /*
-  Copyright (C) 2012-2013 Paul Brossier <piem@aubio.org>
+  Copyright (C) 2012-2014 Paul Brossier <piem@aubio.org>
 
   This file is part of aubio.
@@ -40 +40 @@
 #endif
 
+/** sink_apple_audio object */
 typedef struct _aubio_sink_apple_audio_t aubio_sink_apple_audio_t;
 
@@ -53 +54 @@
   Creates a new sink object.
 
+  If samplerate is set to 0, the creation of the file will be delayed until
+  both ::aubio_sink_preset_samplerate and ::aubio_sink_preset_channels have
+  been called.
+
 */
 aubio_sink_apple_audio_t * new_aubio_sink_apple_audio(char_t * uri, uint_t samplerate);
+
+/**
+
+  preset sink samplerate
+
+  \param s sink, created with ::new_aubio_sink_apple_audio
+  \param samplerate samplerate to preset the sink to, in Hz
+
+  \return 0 on success, 1 on error
+
+  Preset the samplerate of the sink. The file should have been created using a
+  samplerate of 0.
+
+  The file will be opened only when both samplerate and channels have been set.
+
+*/
+uint_t aubio_sink_apple_audio_preset_samplerate(aubio_sink_apple_audio_t *s, uint_t samplerate);
+
+/**
+
+  preset sink channels
+
+  \param s sink, created with ::new_aubio_sink_apple_audio
+  \param channels number of channels to preset the sink to
+
+  \return 0 on success, 1 on error
+
+  Preset the samplerate of the sink. The file should have been created using a
+  samplerate of 0.
+
+  The file will be opened only when both samplerate and channels have been set.
+
+*/
+uint_t aubio_sink_apple_audio_preset_channels(aubio_sink_apple_audio_t *s, uint_t channels);
+
+/**
+
+  get samplerate of sink object
+
+  \param s sink object, created with ::new_aubio_sink_apple_audio
+  \return samplerate, in Hz
+
+*/
+uint_t aubio_sink_apple_audio_get_samplerate(aubio_sink_apple_audio_t *s);
+
+/**
+
+  get channels of sink object
+
+  \param s sink object, created with ::new_aubio_sink_apple_audio
+  \return number of channels
+
+*/
+uint_t aubio_sink_apple_audio_get_channels(aubio_sink_apple_audio_t *s);
 
 /**
@@ -66 +125 @@
 */
 void aubio_sink_apple_audio_do(aubio_sink_apple_audio_t * s, fvec_t * write_data, uint_t write);
+
+/**
+
+  write polyphonic vector of length hop_size to sink
+
+  \param s sink, created with ::new_aubio_sink_apple_audio
+  \param write_data ::fmat_t samples to write to sink
+  \param write number of frames to write
+
+*/
+void aubio_sink_apple_audio_do_multi(aubio_sink_apple_audio_t * s, fmat_t * write_data, uint_t write);
 
 /**