#include <sndfile.h>
#include "aubio_priv.h"
-#include "source_sndfile.h"
#include "fvec.h"
+#include "fmat.h"
+#include "source_sndfile.h"
#include "temporal/resampler.h"
// some temporary memory for sndfile to write at
uint_t scratch_size;
- smpl_t *scratch_data;
+ float *scratch_data;
};
aubio_source_sndfile_t * new_aubio_source_sndfile(char_t * path, uint_t samplerate, uint_t hop_size) {
aubio_source_sndfile_t * s = AUBIO_NEW(aubio_source_sndfile_t);
+ SF_INFO sfinfo;
if (path == NULL) {
- AUBIO_ERR("Aborted opening null path\n");
- return NULL;
+ AUBIO_ERR("source_sndfile: Aborted opening null path\n");
+ goto beach;
+ }
+ if ((sint_t)samplerate < 0) {
+ AUBIO_ERR("source_sndfile: Can not open %s with samplerate %d\n", path, samplerate);
+ goto beach;
+ }
+ if ((sint_t)hop_size <= 0) {
+ AUBIO_ERR("source_sndfile: Can not open %s with hop_size %d\n", path, hop_size);
+ goto beach;
}
s->hop_size = hop_size;
- s->samplerate = samplerate;
s->channels = 1;
s->path = path;
- // try opening the file, geting the info in sfinfo
- SF_INFO sfinfo;
+ // try opening the file, getting the info in sfinfo
AUBIO_MEMSET(&sfinfo, 0, sizeof (sfinfo));
s->handle = sf_open (s->path, SFM_READ, &sfinfo);
if (s->handle == NULL) {
/* show libsndfile err msg */
- AUBIO_ERR("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;
}
s->input_channels = sfinfo.channels;
s->input_format = sfinfo.format;
+ if (samplerate == 0) {
+ samplerate = s->input_samplerate;
+ //AUBIO_DBG("sampling rate set to 0, automagically adjusting to %d\n", samplerate);
+ }
+ s->samplerate = samplerate;
/* compute input block size required before resampling */
s->ratio = s->samplerate/(float)s->input_samplerate;
s->input_hop_size = (uint_t)FLOOR(s->hop_size / s->ratio + .5);
if (s->input_hop_size * s->input_channels > MAX_SAMPLES) {
- AUBIO_ERR("Not able to process more than %d frames of %d channels\n",
+ AUBIO_ERR("source_sndfile: Not able to process more than %d frames of %d channels\n",
MAX_SAMPLES / s->input_channels, s->input_channels);
goto beach;
}
s->input_data = NULL;
if (s->ratio != 1) {
s->input_data = new_fvec(s->input_hop_size);
- s->resampler = new_aubio_resampler(s->ratio, 0);
+ s->resampler = 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 ) {
- AUBIO_ERR("can not upsample from %d to %d\n", s->input_samplerate, s->samplerate);
+ AUBIO_ERR("source_sndfile: can not upsample %s from %d to %d\n", s->path,
+ s->input_samplerate, s->samplerate);
goto beach;
}
- AUBIO_WRN("upsampling %s from %d to % d\n", s->path, s->input_samplerate, s->samplerate);
+ AUBIO_WRN("source_sndfile: upsampling %s from %d to %d\n", s->path,
+ s->input_samplerate, s->samplerate);
}
}
#else
if (s->ratio != 1) {
- AUBIO_ERR("aubio was compiled without aubio_resampler\n");
+ AUBIO_ERR("source_sndfile: aubio was compiled without aubio_resampler\n");
goto beach;
}
#endif /* HAVE_SAMPLERATE */
return s;
beach:
- AUBIO_ERR("can not read %s at samplerate %dHz with a hop_size of %d\n",
- s->path, s->samplerate, s->hop_size);
+ //AUBIO_ERR("can not read %s at samplerate %dHz with a hop_size of %d\n",
+ // s->path, s->samplerate, s->hop_size);
del_aubio_source_sndfile(s);
return NULL;
}
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;
- /* do actual reading */
+ /* read from file into scratch_data */
sf_count_t read_samples = sf_read_float (s->handle, s->scratch_data, s->scratch_size);
- smpl_t *data;
-
+ /* where to store de-interleaved data */
+ smpl_t *ptr_data;
#ifdef HAVE_SAMPLERATE
if (s->ratio != 1) {
- data = s->input_data->data;
+ ptr_data = s->input_data->data;
} else
#endif /* HAVE_SAMPLERATE */
{
- data = read_data->data;
+ ptr_data = read_data->data;
}
/* de-interleaving and down-mixing data */
for (j = 0; j < read_samples / input_channels; j++) {
- data[j] = 0;
+ ptr_data[j] = 0;
for (i = 0; i < input_channels; i++) {
- data[j] += (smpl_t)s->scratch_data[input_channels*j+i];
+ ptr_data[j] += s->scratch_data[input_channels*j+i];
}
- data[j] /= (smpl_t)input_channels;
+ ptr_data[j] /= (smpl_t)input_channels;
}
#ifdef HAVE_SAMPLERATE
#endif /* HAVE_SAMPLERATE */
*read = (int)FLOOR(s->ratio * read_samples / input_channels + .5);
+
+ if (*read < s->hop_size) {
+ for (j = *read; j < s->hop_size; 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 = sf_read_float (s->handle, s->scratch_data, s->scratch_size);
+
+ /* 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;
+ } 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] = (smpl_t)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] = (smpl_t)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] = (smpl_t)s->scratch_data[j * input_channels + (input_channels - 1)];
+ }
+ }
+ }
+
+#ifdef HAVE_SAMPLERATE
+ if (s->resampler) {
+ //aubio_resampler_do(s->resampler, s->input_data, read_data);
+ }
+#endif /* HAVE_SAMPLERATE */
+
+ *read = (int)FLOOR(s->ratio * read_samples / input_channels + .5);
+
+ if (*read < s->hop_size) {
+ for (i = 0; i < read_data->height; i++) {
+ for (j = *read; j < s->hop_size; j++) {
+ read_data->data[i][j] = 0.;
+ }
+ }
+ }
+
+}
+
+uint_t aubio_source_sndfile_get_samplerate(aubio_source_sndfile_t * s) {
+ return s->samplerate;
+}
+
+uint_t aubio_source_sndfile_get_channels(aubio_source_sndfile_t * s) {
+ return s->input_channels;
+}
+
+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);
+ if (sf_ret == -1) {
+ AUBIO_ERR("source_sndfile: Failed seeking %s at %d: %s\n", s->path, pos, sf_strerror (NULL));
+ return AUBIO_FAIL;
+ }
+ if (sf_ret != resampled_pos) {
+ AUBIO_ERR("source_sndfile: Tried seeking %s at %d, but got %d: %s\n",
+ s->path, resampled_pos, (uint_t)sf_ret, sf_strerror (NULL));
+ return AUBIO_FAIL;
+ }
+ return AUBIO_OK;
+}
+
+uint_t aubio_source_sndfile_close (aubio_source_sndfile_t *s) {
+ if (!s->handle) {
+ return AUBIO_FAIL;
+ }
+ if(sf_close(s->handle)) {
+ AUBIO_ERR("source_sndfile: Error closing file %s: %s\n", s->path, sf_strerror (NULL));
+ return AUBIO_FAIL;
+ }
+ return AUBIO_OK;
}
void del_aubio_source_sndfile(aubio_source_sndfile_t * s){
if (!s) return;
- if (sf_close(s->handle)) {
- AUBIO_ERR("Error closing file %s: %s", s->path, sf_strerror (NULL));
- }
+ aubio_source_sndfile_close(s);
#ifdef HAVE_SAMPLERATE
if (s->resampler != NULL) {
del_aubio_resampler(s->resampler);
projects / aubio.git / blobdiff