Changes in src/io/source_sndfile.c [ebfa80d:7dea72f]

File:

• src/io/source_sndfile.c (modified) (6 diffs)

src/io/source_sndfile.c

@@ -174 +174 @@
       s->hop_size, read_data->length);
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
-      s->scratch_size);
-
-  uint_t read_length = read_samples / s->input_channels;
+      s->input_channels * length);
+
+  length = MIN(read_samples / s->input_channels, length);
 
   /* where to store de-interleaved data */
@@ -186 +186 @@
 #endif /* HAVE_SAMPLERATE */
   {
-    read_length = MIN(length, read_length);
     ptr_data = read_data->data;
   }
 
   /* de-interleaving and down-mixing data  */
-  for (j = 0; j < read_length; j++) {
+  for (j = 0; j < length; j++) {
     ptr_data[j] = 0;
     for (i = 0; i < input_channels; i++) {
@@ -205 +204 @@
 #endif /* HAVE_SAMPLERATE */
 
-  *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5));
+  *read = (int)FLOOR(s->ratio * length + .5);
 
   aubio_source_pad_output (read_data, *read);
@@ -219 +218 @@
       s->path, s->input_channels, read_data->height);
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
-      s->scratch_size);
-
-  uint_t read_length = read_samples / s->input_channels;
+      length * s->input_channels);
+
+  length = MIN(read_samples / s->input_channels, length);
 
   /* where to store de-interleaved data */
@@ -231 +230 @@
 #endif /* HAVE_SAMPLERATE */
   {
-    read_length = MIN(read_length, length);
     ptr_data = read_data->data;
   }
 
-  for (j = 0; j < read_length; j++) {
+  for (j = 0; j < length; j++) {
     for (i = 0; i < channels; i++) {
       ptr_data[i][j] = s->scratch_data[j * input_channels + i];
@@ -254 +252 @@
 #endif /* HAVE_SAMPLERATE */
 
-  *read = MIN(length, (uint_t)FLOOR(s->ratio * read_length + .5));
+  *read = (int)FLOOR(s->ratio * length + .5);
 
   aubio_source_pad_multi_output(read_data, input_channels, *read);