Changeset b4e1438

Timestamp:

Apr 25, 2016, 4:45:22 PM (9 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:

691791e

Parents:

c6e7ba1

Message:

src/io/source_wavread.h: add _get_duration

Files:

• src/io/source_wavread.c (modified) (5 diffs)
• src/io/source_wavread.h (modified) (1 diff)
• tests/src/io/test-source_wavread.c (modified) (2 diffs)

src/io/source_wavread.c

@@ -53 +53 @@
   uint_t eof;
 
+  uint_t duration;
+
   size_t seek_start;
 
@@ -72 +74 @@
   size_t bytes_read = 0, bytes_expected = 44;
   unsigned char buf[5];
-  unsigned int format, channels, sr, byterate, blockalign, bitspersample;//, data_size;
+  unsigned int format, channels, sr, byterate, blockalign, duration, bitspersample;//, data_size;
 
   if (path == NULL) {
@@ -216 +218 @@
   // Subchunk2Size
   bytes_read += fread(buf, 1, 4, s->fid);
+  duration = read_little_endian(buf, 4) / blockalign;
+
   //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);
@@ -235 +239 @@
   s->blockalign= blockalign;
   s->bitspersample = bitspersample;
+
+  s->duration = duration;
 
   s->short_output = (unsigned char *)calloc(s->blockalign, AUBIO_WAVREAD_BUFSIZE);
@@ -375 +381 @@
 }
 
+uint_t aubio_source_wavread_get_duration (const aubio_source_wavread_t * s) {
+  if (s && s->duration) {
+    return s->duration;
+  }
+  return 0;
+}
+
 uint_t aubio_source_wavread_close (aubio_source_wavread_t * s) {
   if (!s->fid) {

src/io/source_wavread.h

@@ -126 +126 @@
 /**
 
+  get the duration of source object, in frames
+
+  \param s source object, created with ::new_aubio_source_sndfile
+  \return number of frames in file
+
+*/
+uint_t aubio_source_wavread_get_duration (const aubio_source_wavread_t *s);
+
+/**
+
   close source
 

tests/src/io/test-source_wavread.c

@@ -36 +36 @@
   aubio_source_wavread_t * s =
     new_aubio_source_wavread(source_path, samplerate, hop_size);
+
   if (!s) { err = 1; goto beach; }
   fvec_t *vec = new_fvec(hop_size);
+
+  uint_t n_frames_expected = aubio_source_wavread_get_duration(s);
 
   samplerate = aubio_source_wavread_get_samplerate(s);
@@ -47 +50 @@
   } while ( read == hop_size );
 
-  PRINT_MSG("read %d frames at %dHz (%d blocks) from %s\n", n_frames, samplerate,
-    n_frames / hop_size, source_path);
+  PRINT_MSG("read %d frames (expected %d) at %dHz (%d blocks) from %s\n",
+            n_frames, n_frames_expected, samplerate, n_frames / hop_size,
+            source_path);
 
   del_fvec (vec);