*/
-
-#include "config.h"
+#include "aubio_priv.h"
#ifdef HAVE_SNDFILE
#include <sndfile.h>
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
+#include "ioutils.h"
#include "source_sndfile.h"
#include "temporal/resampler.h"
-#define MAX_CHANNELS 6
#define MAX_SIZE 4096
-#define MAX_SAMPLES MAX_CHANNELS * MAX_SIZE
+#define MAX_SAMPLES AUBIO_MAX_CHANNELS * MAX_SIZE
#if !HAVE_AUBIO_DOUBLE
#define aubio_sf_read_smpl sf_read_float
smpl_t ratio;
uint_t input_hop_size;
#ifdef HAVE_SAMPLERATE
- aubio_resampler_t *resampler;
+ aubio_resampler_t **resamplers;
fvec_t *input_data;
+ fmat_t *input_mat;
#endif /* HAVE_SAMPLERATE */
// some temporary memory for sndfile to write at
s->hop_size = hop_size;
s->channels = 1;
- 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);
if (s->handle == NULL) {
/* show libsndfile err msg */
- AUBIO_ERR("source_sndfile: Failed opening %s: %s\n", s->path, sf_strerror (NULL));
+ AUBIO_ERR("source_sndfile: Failed opening %s (%s)\n", s->path,
+ sf_strerror (NULL));
goto beach;
}
}
#ifdef HAVE_SAMPLERATE
- s->resampler = NULL;
s->input_data = NULL;
+ s->input_mat = NULL;
+ s->resamplers = NULL;
if (s->ratio != 1) {
+ uint_t i;
+ s->resamplers = AUBIO_ARRAY(aubio_resampler_t*, s->input_channels);
s->input_data = new_fvec(s->input_hop_size);
- s->resampler = new_aubio_resampler(s->ratio, 4);
+ s->input_mat = new_fmat(s->input_channels, s->input_hop_size);
+ for (i = 0; i < (uint_t)s->input_channels; i++) {
+ s->resamplers[i] = new_aubio_resampler(s->ratio, 4);
+ }
if (s->ratio > 1) {
// we would need to add a ring buffer for these
- if ( (uint_t)(s->input_hop_size * s->ratio + .5) != s->hop_size ) {
+ if ( (uint_t)FLOOR(s->input_hop_size * s->ratio + .5) != s->hop_size ) {
AUBIO_ERR("source_sndfile: can not upsample %s from %d to %d\n", s->path,
s->input_samplerate, s->samplerate);
goto beach;
AUBIO_WRN("source_sndfile: upsampling %s from %d to %d\n", s->path,
s->input_samplerate, s->samplerate);
}
+ s->duration = (uint_t)FLOOR(s->duration * s->ratio);
}
#else
if (s->ratio != 1) {
void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_data, uint_t * read){
uint_t i,j, input_channels = s->input_channels;
/* read from file into scratch_data */
- sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data, s->scratch_size);
+ uint_t length = aubio_source_validate_input_length("source_sndfile", s->path,
+ s->hop_size, read_data->length);
+ sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
+ s->input_channels * length);
+
+ length = MIN(read_samples / s->input_channels, length);
/* where to store de-interleaved data */
smpl_t *ptr_data;
}
/* de-interleaving and down-mixing data */
- for (j = 0; j < read_samples / input_channels; j++) {
+ for (j = 0; j < length; j++) {
ptr_data[j] = 0;
for (i = 0; i < input_channels; i++) {
ptr_data[j] += s->scratch_data[input_channels*j+i];
}
#ifdef HAVE_SAMPLERATE
- if (s->resampler) {
- aubio_resampler_do(s->resampler, s->input_data, read_data);
+ if (s->resamplers) {
+ aubio_resampler_do(s->resamplers[0], s->input_data, read_data);
}
#endif /* HAVE_SAMPLERATE */
- *read = (int)FLOOR(s->ratio * read_samples / input_channels + .5);
+ *read = (int)FLOOR(s->ratio * length + .5);
- if (*read < s->hop_size) {
- for (j = *read; j < s->hop_size; j++) {
+ if (*read < read_data->length) {
+ for (j = *read; j < read_data->length; j++) {
read_data->data[j] = 0;
}
}
void aubio_source_sndfile_do_multi(aubio_source_sndfile_t * s, fmat_t * read_data, uint_t * read){
uint_t i,j, input_channels = s->input_channels;
/* do actual reading */
- sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data, s->scratch_size);
+ uint_t length = aubio_source_validate_input_length("source_sndfile", s->path,
+ s->hop_size, read_data->length);
+ uint_t channels = aubio_source_validate_input_channels("source_sndfile",
+ s->path, s->input_channels, read_data->height);
+ sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
+ length * s->input_channels);
+
+ length = MIN(read_samples / s->input_channels, length);
/* where to store de-interleaved data */
smpl_t **ptr_data;
#ifdef HAVE_SAMPLERATE
if (s->ratio != 1) {
- AUBIO_ERR("source_sndfile: no multi channel resampling yet\n");
- return;
- //ptr_data = s->input_data->data;
+ ptr_data = s->input_mat->data;
} else
#endif /* HAVE_SAMPLERATE */
{
ptr_data = read_data->data;
}
- if (read_data->height < input_channels) {
- // destination matrix has less channels than the file; copy only first
- // channels of the file, de-interleaving data
- for (j = 0; j < read_samples / input_channels; j++) {
- for (i = 0; i < read_data->height; i++) {
- ptr_data[i][j] = s->scratch_data[j * input_channels + i];
- }
- }
- } else {
- // destination matrix has as many or more channels than the file; copy each
- // channel from the file to the destination matrix, de-interleaving data
- for (j = 0; j < read_samples / input_channels; j++) {
- for (i = 0; i < input_channels; i++) {
- ptr_data[i][j] = s->scratch_data[j * input_channels + i];
- }
- }
- }
-
- if (read_data->height > input_channels) {
- // destination matrix has more channels than the file; copy last channel
- // of the file to each additional channels, de-interleaving data
- for (j = 0; j < read_samples / input_channels; j++) {
- for (i = input_channels; i < read_data->height; i++) {
- ptr_data[i][j] = s->scratch_data[j * input_channels + (input_channels - 1)];
- }
+ for (j = 0; j < length; j++) {
+ for (i = 0; i < channels; i++) {
+ ptr_data[i][j] = s->scratch_data[j * input_channels + i];
}
}
#ifdef HAVE_SAMPLERATE
- if (s->resampler) {
- //aubio_resampler_do(s->resampler, s->input_data, read_data);
+ if (s->resamplers) {
+ for (i = 0; i < input_channels; i++) {
+ fvec_t input_chan, read_chan;
+ input_chan.data = s->input_mat->data[i];
+ input_chan.length = s->input_mat->length;
+ read_chan.data = read_data->data[i];
+ read_chan.length = read_data->length;
+ aubio_resampler_do(s->resamplers[i], &input_chan, &read_chan);
+ }
}
#endif /* HAVE_SAMPLERATE */
- *read = (int)FLOOR(s->ratio * read_samples / input_channels + .5);
+ *read = (int)FLOOR(s->ratio * length + .5);
- if (*read < s->hop_size) {
+ if (*read < read_data->length) {
for (i = 0; i < read_data->height; i++) {
- for (j = *read; j < s->hop_size; j++) {
+ for (j = *read; j < read_data->length; j++) {
read_data->data[i][j] = 0.;
}
}
uint_t aubio_source_sndfile_seek (aubio_source_sndfile_t * s, uint_t pos) {
uint_t resampled_pos = (uint_t)ROUND(pos / s->ratio);
- sf_count_t sf_ret = sf_seek (s->handle, resampled_pos, SEEK_SET);
+ sf_count_t sf_ret;
+ if (s->handle == NULL) {
+ AUBIO_ERR("source_sndfile: failed seeking in %s (file not opened?)\n",
+ s->path);
+ return AUBIO_FAIL;
+ }
+ if ((sint_t)pos < 0) {
+ AUBIO_ERR("source_sndfile: could not seek %s at %d (seeking position"
+ " should be >= 0)\n", s->path, pos);
+ return AUBIO_FAIL;
+ }
+ sf_ret = sf_seek (s->handle, resampled_pos, SEEK_SET);
if (sf_ret == -1) {
AUBIO_ERR("source_sndfile: Failed seeking %s at %d: %s\n", s->path, pos, sf_strerror (NULL));
return AUBIO_FAIL;
uint_t aubio_source_sndfile_close (aubio_source_sndfile_t *s) {
if (!s->handle) {
- return AUBIO_FAIL;
+ return AUBIO_OK;
}
if(sf_close(s->handle)) {
AUBIO_ERR("source_sndfile: Error closing file %s: %s\n", s->path, sf_strerror (NULL));
return AUBIO_FAIL;
}
+ s->handle = NULL;
return AUBIO_OK;
}
void del_aubio_source_sndfile(aubio_source_sndfile_t * s){
- if (!s) return;
+ AUBIO_ASSERT(s);
aubio_source_sndfile_close(s);
#ifdef HAVE_SAMPLERATE
- if (s->resampler != NULL) {
- del_aubio_resampler(s->resampler);
+ if (s->resamplers != NULL) {
+ uint_t i = 0, input_channels = s->input_channels;
+ for (i = 0; i < input_channels; i ++) {
+ if (s->resamplers[i] != NULL) {
+ del_aubio_resampler(s->resamplers[i]);
+ }
+ }
+ AUBIO_FREE(s->resamplers);
}
if (s->input_data) {
del_fvec(s->input_data);
}
+ if (s->input_mat) {
+ del_fmat(s->input_mat);
+ }
#endif /* HAVE_SAMPLERATE */
if (s->path) AUBIO_FREE(s->path);
AUBIO_FREE(s->scratch_data);
projects / aubio.git / blobdiff