Changeset 50e10a9 for src

Timestamp:

Sep 30, 2013, 5:18:49 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:

a06ab19

Parents:

8e7d66f

git-author:

Paul Brossier <piem@piem.org> (09/26/13 21:56:55)

git-committer:

Paul Brossier <piem@piem.org> (09/30/13 17:18:49)

Message:

src/io/source_sndfile.c: call a float a float, do the right thing when a trying to read to a matrix with a number of channels different from the file

File:

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

src/io/source_sndfile.c

@@ -59 +59 @@
   // some temporary memory for sndfile to write at
   uint_t scratch_size;
-  smpl_t *scratch_data;
+  float *scratch_data;
 };
 
@@ -199 +199 @@
   }
 
-  /* de-interleaving data */
-  for (j = 0; j < read_samples / input_channels; j++) {
-    for (i = 0; i < input_channels; i++) {
-      data[i][j] = (smpl_t)s->scratch_data[input_channels*j+i];
-    }
-  }
-  // if read_data has more channels than the file
+  if (read_data->height < input_channels) {
+    // destination matrix has less channels than the file; copy only first
+    // channels of the file, de-interleaving data
+    for (j = 0; j < read_samples / input_channels; j++) {
+      for (i = 0; i < read_data->height; i++) {
+        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
+      }
+    }
+  } else {
+    // destination matrix has as many or more channels than the file; copy each
+    // channel from the file to the destination matrix, de-interleaving data
+    for (j = 0; j < read_samples / input_channels; j++) {
+      for (i = 0; i < input_channels; i++) {
+        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
+      }
+    }
+  }
+
   if (read_data->height > input_channels) {
-    // copy last channel to all additional channels
+    // destination matrix has more channels than the file; copy last channel
+    // of the file to each additional channels, de-interleaving data
     for (j = 0; j < read_samples / input_channels; j++) {
       for (i = input_channels; i < read_data->height; i++) {
-        data[i][j] = s->scratch_data[ j * input_channels + (input_channels - 1)];
+        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + (input_channels - 1)];
       }
     }