*/
-#ifdef __APPLE__
-#include "config.h"
#include "aubio_priv.h"
+
+#ifdef HAVE_SOURCE_APPLE_AUDIO
+
#include "fvec.h"
#include "fmat.h"
#include "io/source_apple_audio.h"
extern int createAubioBufferList(AudioBufferList *bufferList, int channels, int max_source_samples);
extern void freeAudioBufferList(AudioBufferList *bufferList);
-extern CFURLRef getURLFromPath(const char * path);
+extern CFURLRef createURLFromPath(const char * path);
char_t *getPrintableOSStatusError(char_t *str, OSStatus error);
-uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * path);
+uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, const char_t * path);
-aubio_source_apple_audio_t * new_aubio_source_apple_audio(char_t * path, uint_t samplerate, uint_t block_size)
+aubio_source_apple_audio_t * new_aubio_source_apple_audio(const char_t * path, uint_t samplerate, uint_t block_size)
{
aubio_source_apple_audio_t * s = AUBIO_NEW(aubio_source_apple_audio_t);
+ if (path == NULL) {
+ AUBIO_ERROR("source_apple_audio: Aborted opening null path\n");
+ goto beach;
+ }
+
+ if ( (sint_t)block_size <= 0 ) {
+ AUBIO_ERROR("source_apple_audio: Can not open %s with null or negative block_size %d\n",
+ path, block_size);
+ goto beach;
+ }
+
+ if ( (sint_t)samplerate < 0 ) {
+ AUBIO_ERROR("source_apple_audio: Can not open %s with negative samplerate %d\n",
+ path, samplerate);
+ goto beach;
+ }
+
s->block_size = block_size;
s->samplerate = samplerate;
return s;
beach:
- AUBIO_FREE(s);
+ del_aubio_source_apple_audio(s);
return NULL;
}
-uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, char_t * path)
+uint_t aubio_source_apple_audio_open (aubio_source_apple_audio_t *s, const char_t * path)
{
OSStatus err = noErr;
UInt32 propSize;
- s->path = path;
+
+ if (s->path) AUBIO_FREE(s->path);
+ s->path = AUBIO_ARRAY(char_t, strnlen(path, PATH_MAX) + 1);
+ strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
// open the resource url
- CFURLRef fileURL = getURLFromPath(path);
+ CFURLRef fileURL = createURLFromPath(s->path);
err = ExtAudioFileOpenURL(fileURL, &s->audioFile);
+ CFRelease(fileURL);
if (err == -43) {
AUBIO_ERR("source_apple_audio: Failed opening %s, "
"file not found, or no read access\n", s->path);
AUBIO_ERROR("source_apple_audio: Failed opening %s, "
"error in ExtAudioFileSetProperty (%s)\n", s->path,
getPrintableOSStatusError(errorstr, err));
-#if 1
+#if 0
// print client and format descriptions
AUBIO_DBG("Opened %s\n", s->path);
AUBIO_DBG("file/client Format.mFormatID: : %3c%c%c%c / %c%c%c%c\n",
smpl_t **buf = read_to->data;
for (v = 0; v < loadedPackets; v++) {
- for (c = 0; c < s->channels; c++) {
+ for (c = 0; c < read_to->height; c++) {
buf[c][v] = SHORT_TO_FLOAT(data[ v * s->channels + c]);
}
}
uint_t aubio_source_apple_audio_close (aubio_source_apple_audio_t *s)
{
OSStatus err = noErr;
- if (!s->audioFile) { return AUBIO_FAIL; }
+ if (!s->audioFile) { return AUBIO_OK; }
err = ExtAudioFileDispose(s->audioFile);
s->audioFile = NULL;
if (err) {
void del_aubio_source_apple_audio(aubio_source_apple_audio_t * s){
aubio_source_apple_audio_close (s);
+ if (s->path) AUBIO_FREE(s->path);
freeAudioBufferList(&s->bufferList);
AUBIO_FREE(s);
return;
}
uint_t aubio_source_apple_audio_seek (aubio_source_apple_audio_t * s, uint_t pos) {
- // after a short read, the bufferList size needs to resetted to prepare for a full read
- AudioBufferList *bufferList = &s->bufferList;
- bufferList->mBuffers[0].mDataByteSize = s->block_size * s->channels * sizeof (short);
+ OSStatus err = noErr;
+ if ((sint_t)pos < 0) {
+ AUBIO_ERROR("source_apple_audio: error while seeking in %s "
+ "(can not seek at negative position %d)\n",
+ s->path, pos);
+ err = -1;
+ goto beach;
+ }
+ // check if we are not seeking out of the file
+ uint_t fileLengthFrames = aubio_source_apple_audio_get_duration(s);
// compute position in the source file, before resampling
smpl_t ratio = s->source_samplerate * 1. / s->samplerate;
SInt64 resampled_pos = (SInt64)ROUND( pos * ratio );
- OSStatus err = ExtAudioFileSeek(s->audioFile, resampled_pos);
+ if (resampled_pos > fileLengthFrames) {
+ AUBIO_ERR("source_apple_audio: trying to seek in %s at pos %d, "
+ "but file has only %d frames\n",
+ s->path, pos, (uint_t)(fileLengthFrames / ratio));
+ err = -1;
+ goto beach;
+ }
+ // after a short read, the bufferList size needs to resetted to prepare for a full read
+ AudioBufferList *bufferList = &s->bufferList;
+ bufferList->mBuffers[0].mDataByteSize = s->block_size * s->channels * sizeof (short);
+ // do the actual seek
+ err = ExtAudioFileSeek(s->audioFile, resampled_pos);
if (err) {
char_t errorstr[20];
AUBIO_ERROR("source_apple_audio: error while seeking %s at %d "
"in ExtAudioFileSeek (%s)\n", s->path, pos,
getPrintableOSStatusError(errorstr, err));
}
+#if 0
+ // check position after seek
+ {
+ SInt64 outFrameOffset = 0;
+ err = ExtAudioFileTell(s->audioFile, &outFrameOffset);
+ if (err) {
+ char_t errorstr[20];
+ AUBIO_ERROR("source_apple_audio: error while seeking %s at %d "
+ "in ExtAudioFileTell (%s)\n", s->path, pos,
+ getPrintableOSStatusError(errorstr, err));
+ }
+ AUBIO_DBG("source_apple_audio: asked seek at %d, tell got %d\n",
+ pos, (uint_t)(outFrameOffset / ratio + .5));
+ }
+#endif
+beach:
return err;
}
-uint_t aubio_source_apple_audio_get_samplerate(aubio_source_apple_audio_t * s) {
+uint_t aubio_source_apple_audio_get_samplerate(const aubio_source_apple_audio_t * s) {
return s->samplerate;
}
-uint_t aubio_source_apple_audio_get_channels(aubio_source_apple_audio_t * s) {
+uint_t aubio_source_apple_audio_get_channels(const aubio_source_apple_audio_t * s) {
return s->channels;
}
-#endif /* __APPLE__ */
+uint_t aubio_source_apple_audio_get_duration(const aubio_source_apple_audio_t * s) {
+ SInt64 fileLengthFrames = 0;
+ UInt32 propSize = sizeof(fileLengthFrames);
+ OSStatus err = ExtAudioFileGetProperty(s->audioFile,
+ kExtAudioFileProperty_FileLengthFrames, &propSize, &fileLengthFrames);
+ if (err) {
+ char_t errorstr[20];
+ AUBIO_ERROR("source_apple_audio: Failed getting %s duration, "
+ "error in ExtAudioFileGetProperty (%s)\n", s->path,
+ getPrintableOSStatusError(errorstr, err));
+ return err;
+ }
+ return (uint_t)fileLengthFrames;
+}
+
+#endif /* HAVE_SOURCE_APPLE_AUDIO */