Changeset 87636d0

Timestamp:

Mar 12, 2014, 4:32:32 AM (11 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

46148d3

Parents:

46b00690

Message:

src/io/source_wavread.c: use the return value of fread to detect short read and compute seek_start

File:

• src/io/source_wavread.c (modified) (11 diffs)

src/io/source_wavread.c

@@ -53 +53 @@
   uint_t eof;
 
+  size_t seek_start;
+
   unsigned char *short_output;
   fmat_t *output;
@@ -68 +70 @@
 aubio_source_wavread_t * new_aubio_source_wavread(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_expected = 44;
   unsigned char buf[5];
   unsigned int format, channels, sr, byterate, blockalign, bitspersample;//, data_size;
@@ -95 +98 @@
 
   // ChunkID
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   buf[4] = '\0';
   if ( strcmp((const char *)buf, "RIFF") != 0 ) {
@@ -103 +106 @@
 
   // ChunkSize
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
 
   // Format
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   buf[4] = '\0';
   if ( strcmp((const char *)buf, "WAVE") != 0 ) {
@@ -114 +117 @@
 
   // Subchunk1ID
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   buf[4] = '\0';
   if ( strcmp((const char *)buf, "fmt ") != 0 ) {
@@ -122 +125 @@
 
   // Subchunk1Size
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   format = read_little_endian(buf, 4);
   if ( format != 16 ) {
@@ -135 +138 @@
 
   // AudioFormat
-  fread(buf, 2, 1, s->fid);
+  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);
@@ -142 +145 @@
 
   // NumChannels
-  fread(buf, 2, 1, s->fid);
+  bytes_read += fread(buf, 1, 2, s->fid);
   channels = read_little_endian(buf, 2);
 
   // SampleRate
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   sr = read_little_endian(buf, 4);
 
   // ByteRate
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   byterate = read_little_endian(buf, 4);
 
   // BlockAlign
-  fread(buf, 2, 1, s->fid);
+  bytes_read += fread(buf, 1, 2, s->fid);
   blockalign = read_little_endian(buf, 2);
 
   // BitsPerSample
-  fread(buf, 2, 1, s->fid);
+  bytes_read += fread(buf, 1, 2, s->fid);
   bitspersample = read_little_endian(buf, 2);
 #if 0
@@ -201 +204 @@
 
   // Subchunk2ID
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   buf[4] = '\0';
   if ( strcmp((const char *)buf, "data") != 0 ) {
@@ -209 +212 @@
 
   // Subchunk2Size
-  fread(buf, 4, 1, s->fid);
+  bytes_read += fread(buf, 1, 4, s->fid);
   //data_size = buf[0] + (buf[1] << 8) + (buf[2] << 16) + (buf[3] << 24);
   //AUBIO_MSG("found %d frames in %s\n", 8 * data_size / bitspersample / channels, s->path);
+
+  // check the total number of bytes read is correct
+  if ( bytes_read != bytes_expected ) {
+    AUBIO_ERR("source_wavread: short read (%zd instead of %zd) in %s\n",
+        bytes_read, bytes_expected, s->path);
+    goto beach;
+  }
+  s->seek_start = bytes_read;
 
   s->output = new_fmat(s->input_channels, AUBIO_WAVREAD_BUFSIZE);
@@ -341 +352 @@
 
 uint_t aubio_source_wavread_seek (aubio_source_wavread_t * s, uint_t pos) {
-  uint_t ret = fseek(s->fid, 44 + pos * s->blockalign, SEEK_SET);
+  uint_t ret = fseek(s->fid, s->seek_start + pos * s->blockalign, SEEK_SET);
   s->eof = 0;
   s->read_index = 0;