[io] fix source output padding sizes

[aubio.git] / src / io / ioutils.c

diff --git a/src/io/ioutils.c b/src/io/ioutils.c
index 55f7c4f..6657352 100644 (file)
--- a/src/io/ioutils.c
+++ b/src/io/ioutils.c
@@ -96,8 +96,8 @@ void
 aubio_source_pad_output (fvec_t *read_data, uint_t source_read)
 {
   if (source_read < read_data->length) {
-    AUBIO_MEMSET(read_data->data + source_read, 0, read_data->length -
-        source_read);
+    AUBIO_MEMSET(read_data->data + source_read, 0,
+        (read_data->length - source_read) * sizeof(smpl_t));
   }
 }
 
@@ -108,7 +108,16 @@ aubio_source_pad_multi_output (fmat_t *read_data,
   if (source_read < read_data->length) {
     for (i = 0; i < read_data->height; i++) {
       AUBIO_MEMSET(read_data->data[i] + source_read, 0,
-          read_data->length - source_read);
+          (read_data->length - source_read) * sizeof(smpl_t));
+    }
+  }
+
+  // destination matrix has more channels than the file
+  // copy channels from the source to extra output channels
+  if (read_data->height > source_channels) {
+    for (i = source_channels; i < read_data->height; i++) {
+      AUBIO_MEMCPY(read_data->data[i], read_data->data[i % source_channels],
+          sizeof(smpl_t) * read_data->length);
     }
   }
 }