From: Paul Brossier Date: Sun, 23 Feb 2014 16:00:26 +0000 (-0300) Subject: src/io/sink_sndfile.h: add do_multi, preset_samplerate, preset_channels, get_samplera... X-Git-Tag: 0.4.1~34 X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=14ac1db982c8111ab2e74041c26d505f711fe536;p=aubio.git src/io/sink_sndfile.h: add do_multi, preset_samplerate, preset_channels, get_samplerate, and get_channels --- diff --git a/src/io/sink_sndfile.c b/src/io/sink_sndfile.c index dace3151..2824e741 100644 --- a/src/io/sink_sndfile.c +++ b/src/io/sink_sndfile.c @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Brossier + Copyright (C) 2012-2014 Paul Brossier This file is part of aubio. @@ -44,21 +44,74 @@ struct _aubio_sink_sndfile_t { smpl_t *scratch_data; }; +uint_t aubio_sink_sndfile_open(aubio_sink_sndfile_t *s); + aubio_sink_sndfile_t * new_aubio_sink_sndfile(char_t * path, uint_t samplerate) { aubio_sink_sndfile_t * s = AUBIO_NEW(aubio_sink_sndfile_t); - SF_INFO sfinfo; + s->max_size = MAX_SIZE; + s->path = path; if (path == NULL) { AUBIO_ERR("sink_sndfile: Aborted opening null path\n"); return NULL; } + 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->max_size = MAX_SIZE; s->channels = 1; - s->path = path; + if (aubio_sink_sndfile_open(s) != AUBIO_OK) {; + goto beach; + } + return s; + +beach: + del_aubio_sink_sndfile(s); + return NULL; +} + +uint_t aubio_sink_sndfile_preset_samplerate(aubio_sink_sndfile_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_sndfile_open(s); + } + return AUBIO_OK; +} + +uint_t aubio_sink_sndfile_preset_channels(aubio_sink_sndfile_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_sndfile_open(s); + } + return AUBIO_OK; +} + +uint_t aubio_sink_sndfile_get_samplerate(aubio_sink_sndfile_t *s) +{ + return s->samplerate; +} + +uint_t aubio_sink_sndfile_get_channels(aubio_sink_sndfile_t *s) +{ + return s->channels; +} + +uint_t aubio_sink_sndfile_open(aubio_sink_sndfile_t *s) { /* set output format */ + SF_INFO sfinfo; AUBIO_MEMSET(&sfinfo, 0, sizeof (sfinfo)); sfinfo.samplerate = s->samplerate; sfinfo.channels = s->channels; @@ -70,8 +123,7 @@ aubio_sink_sndfile_t * new_aubio_sink_sndfile(char_t * path, uint_t samplerate) if (s->handle == NULL) { /* show libsndfile err msg */ AUBIO_ERR("sink_sndfile: Failed opening %s. %s\n", s->path, sf_strerror (NULL)); - AUBIO_FREE(s); - return NULL; + return AUBIO_FAIL; } s->scratch_size = s->max_size*s->channels; @@ -79,12 +131,11 @@ aubio_sink_sndfile_t * new_aubio_sink_sndfile(char_t * path, uint_t samplerate) if (s->scratch_size >= MAX_SIZE * MAX_CHANNELS) { AUBIO_ERR("sink_sndfile: %d x %d exceeds maximum aubio_sink_sndfile buffer size %d\n", s->max_size, s->channels, MAX_CHANNELS * MAX_CHANNELS); - AUBIO_FREE(s); - return NULL; + return AUBIO_FAIL; } s->scratch_data = AUBIO_ARRAY(float,s->scratch_size); - return s; + return AUBIO_OK; } void aubio_sink_sndfile_do(aubio_sink_sndfile_t *s, fvec_t * write_data, uint_t write){ diff --git a/src/io/sink_sndfile.h b/src/io/sink_sndfile.h index ada74cb1..e5e07b2e 100644 --- a/src/io/sink_sndfile.h +++ b/src/io/sink_sndfile.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2013 Paul Brossier + Copyright (C) 2012-2014 Paul Brossier This file is part of aubio. @@ -38,6 +38,7 @@ extern "C" { #endif +/** sink_sndfile object */ typedef struct _aubio_sink_sndfile_t aubio_sink_sndfile_t; /** @@ -51,11 +52,69 @@ typedef struct _aubio_sink_sndfile_t aubio_sink_sndfile_t; 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_sndfile_t * new_aubio_sink_sndfile(char_t * uri, uint_t samplerate); /** + preset sink samplerate + + \param s sink, created with ::new_aubio_sink_sndfile + \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_sndfile_preset_samplerate(aubio_sink_sndfile_t *s, uint_t samplerate); + +/** + + preset sink channels + + \param s sink, created with ::new_aubio_sink_sndfile + \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_sndfile_preset_channels(aubio_sink_sndfile_t *s, uint_t channels); + +/** + + get samplerate of sink object + + \param s sink object, created with ::new_aubio_sink_sndfile + \return samplerate, in Hz + +*/ +uint_t aubio_sink_sndfile_get_samplerate(aubio_sink_sndfile_t *s); + +/** + + get channels of sink object + + \param s sink object, created with ::new_aubio_sink_sndfile + \return number of channels + +*/ +uint_t aubio_sink_sndfile_get_channels(aubio_sink_sndfile_t *s); + +/** + write monophonic vector of length hop_size to sink \param s sink, created with ::new_aubio_sink_sndfile @@ -67,6 +126,17 @@ void aubio_sink_sndfile_do(aubio_sink_sndfile_t * s, fvec_t * write_data, uint_t /** + write polyphonic vector of length hop_size to sink + + \param s sink, created with ::new_aubio_sink_sndfile + \param write_data ::fmat_t samples to write to sink + \param write number of frames to write + +*/ +void aubio_sink_sndfile_do_multi(aubio_sink_sndfile_t * s, fmat_t * write_data, uint_t write); + +/** + close sink \param s sink_sndfile object, created with ::new_aubio_sink_sndfile diff --git a/tests/src/io/test-sink_sndfile-multi.c b/tests/src/io/test-sink_sndfile-multi.c new file mode 100644 index 00000000..8464f779 --- /dev/null +++ b/tests/src/io/test-sink_sndfile-multi.c @@ -0,0 +1,78 @@ +#define AUBIO_UNSTABLE 1 +#include +#include "utils_tests.h" + +// this file uses the unstable aubio api, please use aubio_sink instead +// see src/io/sink.h and tests/src/sink/test-sink.c + +int main (int argc, char **argv) +{ + sint_t err = 0; + + if (argc < 3) { + err = 2; + PRINT_ERR("not enough arguments\n"); + PRINT_MSG("usage: %s [samplerate] [channels] [hop_size]\n", argv[0]); + return err; + } + +#ifdef __APPLE__ + uint_t samplerate = 0; + uint_t channels = 0; + uint_t hop_size = 512; + uint_t n_frames = 0, read = 0; + + char_t *source_path = argv[1]; + char_t *sink_path = argv[2]; + + if ( argc >= 4 ) samplerate = atoi(argv[3]); + if ( argc >= 5 ) channels = atoi(argv[4]); + if ( argc >= 6 ) hop_size = atoi(argv[5]); + if ( argc >= 7 ) { + err = 2; + PRINT_ERR("too many arguments\n"); + return err; + } + + aubio_source_t *i = new_aubio_source(source_path, samplerate, hop_size); + if (!i) { err = 1; goto beach_source; } + + if (samplerate == 0 ) samplerate = aubio_source_get_samplerate(i); + if (channels == 0 ) channels = aubio_source_get_channels(i); + + fmat_t *mat = new_fmat(channels, hop_size); + if (!mat) { err = 1; goto beach_fmat; } + + aubio_sink_sndfile_t *o = new_aubio_sink_sndfile(sink_path, 0); + if (!o) { err = 1; goto beach_sink; } + err = aubio_sink_sndfile_preset_samplerate(o, samplerate); + if (err) { goto beach; } + err = aubio_sink_sndfile_preset_channels(o, channels); + if (err) { goto beach; } + + do { + aubio_source_do_multi(i, mat, &read); + aubio_sink_sndfile_do_multi(o, mat, read); + n_frames += read; + } while ( read == hop_size ); + + PRINT_MSG("read %d frames at %dHz in %d channels (%d blocks) from %s written to %s\n", + n_frames, samplerate, channels, n_frames / hop_size, + source_path, sink_path); + PRINT_MSG("wrote %s with %dHz in %d channels\n", sink_path, + aubio_sink_sndfile_get_samplerate(o), + aubio_sink_sndfile_get_channels(o) ); + +beach: + del_aubio_sink_sndfile(o); +beach_sink: + del_fmat(mat); +beach_fmat: + del_aubio_source(i); +beach_source: +#else + err = 3; + PRINT_ERR("aubio was not compiled with aubio_sink_sndfile\n"); +#endif /* __APPLE__ */ + return err; +}