Changeset 7bb5cef

Timestamp:

Dec 19, 2013, 11:24:01 PM (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:

50bb325

Parents:

6465d7f

Message:

src/io/source_sndfile.c: fix resampled position in _seek, improve test for non integer ratios

Files:

• src/io/source_sndfile.c (modified) (1 diff)
• tests/src/io/test-source_seek.c (modified) (1 diff)

src/io/source_sndfile.c

@@ -264 +264 @@
 
 uint_t aubio_source_sndfile_seek (aubio_source_sndfile_t * s, uint_t pos) {
-  uint_t resampled_pos = (uint_t)ROUND(pos * s->ratio);
+  uint_t resampled_pos = (uint_t)ROUND(pos / s->ratio);
   return sf_seek (s->handle, resampled_pos, SEEK_SET);
 }

tests/src/io/test-source_seek.c

@@ -85 +85 @@
   del_fvec (vec);
 
+  // check that we got exactly the same number of frames
   assert ( old_n_frames_2 == old_n_frames_1 );
-  assert ( old_n_frames_3 == (uint_t)floor(old_n_frames_1 / 2. + .5) );
+  // check that we got about half the frames, with 3 decimals
+  assert ( roundf(1.e3 * old_n_frames_1 / old_n_frames_3) / 1.e3 == 2.);
   return err;
 }