*/
-#include "config.h"
+#include "aubio_priv.h"
#ifdef HAVE_WAVREAD
-#include "aubio_priv.h"
#include "fvec.h"
#include "fmat.h"
+#include "ioutils.h"
#include "source_wavread.h"
-#include <errno.h>
-
#define AUBIO_WAVREAD_BUFSIZE 1024
#define SHORT_TO_FLOAT(x) (smpl_t)(x * 3.0517578125e-05)
fmat_t *output;
};
-unsigned int read_little_endian (unsigned char *buf, unsigned int length);
-unsigned int read_little_endian (unsigned char *buf, unsigned int length) {
+static unsigned int read_little_endian (unsigned char *buf,
+ unsigned int length);
+
+static unsigned int read_little_endian (unsigned char *buf,
+ unsigned int length)
+{
uint_t i, ret = 0;
for (i = 0; i < length; i++) {
ret += buf[i] << (i * 8);
aubio_source_wavread_t * new_aubio_source_wavread(const char_t * path, uint_t samplerate, uint_t hop_size) {
aubio_source_wavread_t * s = AUBIO_NEW(aubio_source_wavread_t);
size_t bytes_read = 0, bytes_junk = 0, bytes_expected = 44;
- unsigned char buf[5];
+ unsigned char buf[5] = "\0";
unsigned int format, channels, sr, byterate, blockalign, duration, bitspersample;//, data_size;
if (path == NULL) {
goto beach;
}
- 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);
s->fid = fopen((const char *)path, "rb");
if (!s->fid) {
- AUBIO_ERR("source_wavread: Failed opening %s (System error: %s)\n", s->path, strerror(errno));
+ AUBIO_STRERR("source_wavread: Failed opening %s (%s)\n", s->path, errorstr);
goto beach;
}
bytes_read += fread(buf, 1, 4, s->fid);
buf[4] = '\0';
if ( strcmp((const char *)buf, "RIFF") != 0 ) {
- AUBIO_ERR("source_wavread: could not find RIFF header in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (could not find RIFF header)\n", s->path);
goto beach;
}
bytes_read += fread(buf, 1, 4, s->fid);
buf[4] = '\0';
if ( strcmp((const char *)buf, "WAVE") != 0 ) {
- AUBIO_ERR("source_wavread: wrong format in RIFF header in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (wrong format in RIFF header)\n", s->path);
goto beach;
}
buf[4] = '\0';
bytes_junk += read_little_endian(buf, 4);
if (fseek(s->fid, bytes_read + bytes_junk, SEEK_SET) != 0) {
- AUBIO_ERR("source_wavread: could not seek past JUNK Chunk in %s (%s)\n",
- s->path, strerror(errno));
+ AUBIO_STRERR("source_wavread: Failed opening %s (could not seek past JUNK Chunk: %s)\n",
+ s->path, errorstr);
goto beach;
}
bytes_read += bytes_junk;
- bytes_expected += bytes_junk;
+ bytes_expected += bytes_junk + 4;
// now really read the fmt chunk
- fread(buf, 1, 4, s->fid);
+ bytes_read += fread(buf, 1, 4, s->fid);
buf[4] = '\0';
}
// get the fmt chunk
if ( strcmp((const char *)buf, "fmt ") != 0 ) {
- AUBIO_ERR("source_wavread: failed finding fmt RIFF header in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (could not find 'fmt ' in RIFF header)\n", s->path);
goto beach;
}
format = read_little_endian(buf, 4);
if ( format != 16 ) {
// TODO accept format 18
- AUBIO_ERR("source_wavread: file %s is not encoded with PCM\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (not encoded with PCM)\n", s->path);
goto beach;
}
if ( buf[1] || buf[2] | buf[3] ) {
- AUBIO_ERR("source_wavread: Subchunk1Size should be 0, in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (Subchunk1Size should be 0)\n", s->path);
goto beach;
}
// AudioFormat
bytes_read += fread(buf, 1, 2, s->fid);
if ( buf[0] != 1 || buf[1] != 0) {
- AUBIO_ERR("source_wavread: AudioFormat should be PCM, in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (AudioFormat should be PCM)\n", s->path);
goto beach;
}
// BitsPerSample
bytes_read += fread(buf, 1, 2, s->fid);
bitspersample = read_little_endian(buf, 2);
+
+ if ( channels == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (number of channels can not be 0)\n", s->path);
+ goto beach;
+ }
+
+ if ( (sint_t)sr <= 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (samplerate can not be <= 0)\n", s->path);
+ goto beach;
+ }
+
+ if ( byterate == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (byterate can not be 0)\n", s->path);
+ goto beach;
+ }
+
+ if ( bitspersample == 0 ) {
+ AUBIO_ERR("source_wavread: Failed opening %s (bitspersample can not be 0)\n", s->path);
+ goto beach;
+ }
#if 0
if ( bitspersample != 16 ) {
AUBIO_ERR("source_wavread: can not process %dbit file %s\n",
#endif
if ( byterate * 8 != sr * channels * bitspersample ) {
- AUBIO_ERR("source_wavread: wrong byterate in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (wrong byterate)\n", s->path);
goto beach;
}
if ( blockalign * 8 != channels * bitspersample ) {
- AUBIO_ERR("source_wavread: wrong blockalign in %s\n", s->path);
+ AUBIO_ERR("source_wavread: Failed opening %s (wrong blockalign)\n", s->path);
goto beach;
}
// Subchunk2ID
bytes_read += fread(buf, 1, 4, s->fid);
buf[4] = '\0';
- if ( strcmp((const char *)buf, "data") != 0 ) {
- AUBIO_ERR("source_wavread: data RIFF header not found in %s\n", s->path);
- goto beach;
+ while ( strcmp((const char *)buf, "data") != 0 ) {
+ if (feof(s->fid) || ferror(s->fid)) {
+ AUBIO_ERR("source_wavread: no data RIFF header found in %s\n", s->path);
+ goto beach;
+ }
+ bytes_junk = fread(buf, 1, 4, s->fid);
+ buf[4] = '\0';
+ bytes_junk += read_little_endian(buf, 4);
+ if (fseek(s->fid, bytes_read + bytes_junk, SEEK_SET) != 0) {
+ AUBIO_STRERR("source_wavread: could not seek past unknown chunk in %s (%s)\n",
+ s->path, errorstr);
+ goto beach;
+ }
+ bytes_read += bytes_junk;
+ bytes_expected += bytes_junk+ 4;
+ bytes_read += fread(buf, 1, 4, s->fid);
+ buf[4] = '\0';
}
// Subchunk2Size
uint_t i, j;
uint_t end = 0;
uint_t total_wrote = 0;
- while (total_wrote < s->hop_size) {
- end = MIN(s->read_samples - s->read_index, s->hop_size - total_wrote);
+ uint_t length = aubio_source_validate_input_length("source_wavread", s->path,
+ s->hop_size, read_data->length);
+ if (s->fid == NULL) {
+ AUBIO_ERR("source_wavread: could not read from %s (file not opened)\n",
+ s->path);
+ return;
+ }
+ while (total_wrote < length) {
+ end = MIN(s->read_samples - s->read_index, length - total_wrote);
for (i = 0; i < end; i++) {
read_data->data[i + total_wrote] = 0;
for (j = 0; j < s->input_channels; j++ ) {
read_data->data[i + total_wrote] /= (smpl_t)(s->input_channels);
}
total_wrote += end;
- if (total_wrote < s->hop_size) {
+ if (total_wrote < length) {
uint_t wavread_read = 0;
aubio_source_wavread_readframe(s, &wavread_read);
s->read_samples = wavread_read;
s->read_index += end;
}
}
- if (total_wrote < s->hop_size) {
- for (i = end; i < s->hop_size; i++) {
- read_data->data[i] = 0.;
- }
- }
+
+ aubio_source_pad_output (read_data, total_wrote);
+
*read = total_wrote;
}
uint_t i,j;
uint_t end = 0;
uint_t total_wrote = 0;
- while (total_wrote < s->hop_size) {
- end = MIN(s->read_samples - s->read_index, s->hop_size - total_wrote);
- for (j = 0; j < read_data->height; j++) {
+ uint_t length = aubio_source_validate_input_length("source_wavread", s->path,
+ s->hop_size, read_data->length);
+ uint_t channels = aubio_source_validate_input_channels("source_wavread",
+ s->path, s->input_channels, read_data->height);
+ if (s->fid == NULL) {
+ AUBIO_ERR("source_wavread: could not read from %s (file not opened)\n",
+ s->path);
+ return;
+ }
+ while (total_wrote < length) {
+ end = MIN(s->read_samples - s->read_index, length - total_wrote);
+ for (j = 0; j < channels; j++) {
for (i = 0; i < end; i++) {
read_data->data[j][i + total_wrote] = s->output->data[j][i];
}
}
total_wrote += end;
- if (total_wrote < s->hop_size) {
+ if (total_wrote < length) {
uint_t wavread_read = 0;
aubio_source_wavread_readframe(s, &wavread_read);
s->read_samples = wavread_read;
s->read_index += end;
}
}
- if (total_wrote < s->hop_size) {
- for (j = 0; j < read_data->height; j++) {
- for (i = end; i < s->hop_size; i++) {
- read_data->data[j][i] = 0.;
- }
- }
- }
+
+ aubio_source_pad_multi_output(read_data, s->input_channels, total_wrote);
+
*read = total_wrote;
}
uint_t aubio_source_wavread_seek (aubio_source_wavread_t * s, uint_t pos) {
uint_t ret = 0;
+ if (s->fid == NULL) {
+ AUBIO_ERR("source_wavread: could not seek %s (file not opened?)\n", s->path, pos);
+ return AUBIO_FAIL;
+ }
if ((sint_t)pos < 0) {
+ AUBIO_ERR("source_wavread: could not seek %s at %d (seeking position should be >= 0)\n", s->path, pos);
return AUBIO_FAIL;
}
ret = fseek(s->fid, s->seek_start + pos * s->blockalign, SEEK_SET);
if (ret != 0) {
- AUBIO_ERR("source_wavread: could not seek %s at %d (%s)\n", s->path, pos, strerror(errno));
+ AUBIO_STRERR("source_wavread: could not seek %s at %d (%s)\n", s->path, pos, errorstr);
return AUBIO_FAIL;
}
// reset some values
}
uint_t aubio_source_wavread_close (aubio_source_wavread_t * s) {
- if (!s->fid) {
- return AUBIO_FAIL;
+ if (s->fid == NULL) {
+ return AUBIO_OK;
}
if (fclose(s->fid)) {
- AUBIO_ERR("source_wavread: could not close %s (%s)\n", s->path, strerror(errno));
+ AUBIO_STRERR("source_wavread: could not close %s (%s)\n", s->path, errorstr);
return AUBIO_FAIL;
}
s->fid = NULL;
}
void del_aubio_source_wavread(aubio_source_wavread_t * s) {
- if (!s) return;
+ AUBIO_ASSERT(s);
aubio_source_wavread_close(s);
if (s->short_output) AUBIO_FREE(s->short_output);
if (s->output) del_fmat(s->output);
projects / aubio.git / blobdiff