ref: 1b0755db466772fffe8b5643e3a04fa8761efbd6
parent: 2e50800865012262a3705344ee2487a7253396c1
author: Paul Brossier <piem@piem.org>
date: Wed Dec 4 17:00:43 EST 2013
src/io/source.c: rewrite to use any or all of avcodec, apple_audio, or sndfile
--- a/src/aubio.h
+++ b/src/aubio.h
@@ -193,6 +193,7 @@
#include "mathutils.h"
#include "io/source_sndfile.h"
#include "io/source_apple_audio.h"
+#include "io/source_avcodec.h"
#include "io/sink_sndfile.h"
#include "io/sink_apple_audio.h"
#include "io/sndfileio.h"
--- a/src/io/source.c
+++ b/src/io/source.c
@@ -23,28 +23,71 @@
#include "fvec.h"
#include "fmat.h"
#include "io/source.h"
+#ifdef HAVE_AVCODEC
+#include "io/source_avcodec.h"
+#endif /* HAVE_AVCODEC */
#ifdef __APPLE__
#include "io/source_apple_audio.h"
#endif /* __APPLE__ */
#ifdef HAVE_SNDFILE
#include "io/source_sndfile.h"
-#endif
+#endif /* HAVE_SNDFILE */
+typedef void (*aubio_source_do_t)(aubio_source_t * s, fvec_t * data, uint_t * read);
+typedef void (*aubio_source_do_multi_t)(aubio_source_t * s, fmat_t * data, uint_t * read);
+typedef uint_t (*aubio_source_get_samplerate_t)(aubio_source_t * s);
+typedef uint_t (*aubio_source_get_channels_t)(aubio_source_t * s);
+typedef uint_t (*aubio_source_seek_t)(aubio_source_t * s, uint_t seek);
+typedef uint_t (*del_aubio_source_t)(aubio_source_t * s);
+
struct _aubio_source_t { void *source;
+ aubio_source_do_t s_do;
+ aubio_source_do_multi_t s_do_multi;
+ aubio_source_get_samplerate_t s_get_samplerate;
+ aubio_source_get_channels_t s_get_channels;
+ aubio_source_seek_t s_seek;
+ del_aubio_source_t s_del;
};
aubio_source_t * new_aubio_source(char_t * uri, uint_t samplerate, uint_t hop_size) {aubio_source_t * s = AUBIO_NEW(aubio_source_t);
+#if HAVE_AVCODEC
+ s->source = (void *)new_aubio_source_avcodec(uri, samplerate, hop_size);
+ if (s->source) {+ s->s_do = (aubio_source_do_t)(aubio_source_avcodec_do);
+ s->s_do_multi = (aubio_source_do_multi_t)(aubio_source_avcodec_do_multi);
+ s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_avcodec_get_channels);
+ s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_avcodec_get_samplerate);
+ s->s_seek = (aubio_source_seek_t)(aubio_source_avcodec_seek);
+ s->s_del = (del_aubio_source_t)(del_aubio_source_avcodec);
+ return s;
+ }
+#endif /* HAVE_AVCODEC */
#ifdef __APPLE__
s->source = (void *)new_aubio_source_apple_audio(uri, samplerate, hop_size);
- if (s->source) return s;
-#else /* __APPLE__ */
+ if (s->source) {+ s->s_do = (aubio_source_do_t)(aubio_source_apple_audio_do);
+ s->s_do_multi = (aubio_source_do_multi_t)(aubio_source_apple_audio_do_multi);
+ s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_apple_audio_get_channels);
+ s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_apple_audio_get_samplerate);
+ s->s_seek = (aubio_source_seek_t)(aubio_source_apple_audio_seek);
+ s->s_del = (del_aubio_source_t)(del_aubio_source_apple_audio);
+ return s;
+ }
+#endif /* __APPLE__ */
#if HAVE_SNDFILE
s->source = (void *)new_aubio_source_sndfile(uri, samplerate, hop_size);
- if (s->source) return s;
+ if (s->source) {+ s->s_do = (aubio_source_do_t)(aubio_source_sndfile_do);
+ s->s_do_multi = (aubio_source_do_multi_t)(aubio_source_sndfile_do_multi);
+ s->s_get_channels = (aubio_source_get_channels_t)(aubio_source_sndfile_get_channels);
+ s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_sndfile_get_samplerate);
+ s->s_seek = (aubio_source_seek_t)(aubio_source_sndfile_seek);
+ s->s_del = (del_aubio_source_t)(del_aubio_source_sndfile);
+ return s;
+ }
#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
AUBIO_ERROR("failed creating aubio source with %s\n", uri);AUBIO_FREE(s);
return NULL;
@@ -51,63 +94,27 @@
}
void aubio_source_do(aubio_source_t * s, fvec_t * data, uint_t * read) {-#ifdef __APPLE__
- aubio_source_apple_audio_do((aubio_source_apple_audio_t *)s->source, data, read);
-#else /* __APPLE__ */
-#if HAVE_SNDFILE
- aubio_source_sndfile_do((aubio_source_sndfile_t *)s->source, data, read);
-#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
+ s->s_do((void *)s->source, data, read);
}
void aubio_source_do_multi(aubio_source_t * s, fmat_t * data, uint_t * read) {-#ifdef __APPLE__
- aubio_source_apple_audio_do_multi((aubio_source_apple_audio_t *)s->source, data, read);
-#else /* __APPLE__ */
-#if HAVE_SNDFILE
- aubio_source_sndfile_do_multi((aubio_source_sndfile_t *)s->source, data, read);
-#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
+ s->s_do_multi((void *)s->source, data, read);
}
void del_aubio_source(aubio_source_t * s) {if (!s) return;
-#ifdef __APPLE__
- del_aubio_source_apple_audio((aubio_source_apple_audio_t *)s->source);
-#else /* __APPLE__ */
-#if HAVE_SNDFILE
- del_aubio_source_sndfile((aubio_source_sndfile_t *)s->source);
-#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
+ s->s_del((void *)s->source);
AUBIO_FREE(s);
}
uint_t aubio_source_get_samplerate(aubio_source_t * s) {-#ifdef __APPLE__
- return aubio_source_apple_audio_get_samplerate((aubio_source_apple_audio_t *)s->source);
-#else /* __APPLE__ */
-#if HAVE_SNDFILE
- return aubio_source_sndfile_get_samplerate((aubio_source_sndfile_t *)s->source);
-#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
+ return s->s_get_samplerate((void *)s->source);
}
uint_t aubio_source_get_channels(aubio_source_t * s) {-#ifdef __APPLE__
- return aubio_source_apple_audio_get_channels((aubio_source_apple_audio_t *)s->source);
-#else /* __APPLE__ */
-#if HAVE_SNDFILE
- return aubio_source_sndfile_get_channels((aubio_source_sndfile_t *)s->source);
-#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
+ return s->s_get_channels((void *)s->source);
}
uint_t aubio_source_seek (aubio_source_t * s, uint_t seek ) {-#ifdef __APPLE__
- return aubio_source_apple_audio_seek ((aubio_source_apple_audio_t *)s->source, seek);
-#else /* __APPLE__ */
-#if HAVE_SNDFILE
- return aubio_source_sndfile_seek ((aubio_source_sndfile_t *)s->source, seek);
-#endif /* HAVE_SNDFILE */
-#endif /* __APPLE__ */
+ return s->s_seek((void *)s->source, seek);
}