Changes in src/io/source_avcodec.c [2510248:c0a1906]

File:

• src/io/source_avcodec.c (modified) (7 diffs)

src/io/source_avcodec.c

@@ -61 +61 @@
 #include "fvec.h"
 #include "fmat.h"
-#include "ioutils.h"
 #include "source_avcodec.h"
 
@@ -490 +489 @@
   uint_t end = 0;
   uint_t total_wrote = 0;
-  uint_t length = aubio_source_validate_input_length("source_avcodec", s->path,
-      s->hop_size, read_data->length);
-  while (total_wrote < length) {
-    end = MIN(s->read_samples - s->read_index, length - total_wrote);
+  while (total_wrote < s->hop_size) {
+    end = MIN(s->read_samples - s->read_index, s->hop_size - total_wrote);
     for (i = 0; i < end; i++) {
       read_data->data[i + total_wrote] = 0.;
@@ -503 +500 @@
     }
     total_wrote += end;
-    if (total_wrote < length) {
+    if (total_wrote < s->hop_size) {
       uint_t avcodec_read = 0;
       aubio_source_avcodec_readframe(s, &avcodec_read);
@@ -515 +512 @@
     }
   }
-
-  aubio_source_pad_output(read_data, total_wrote);
-
+  if (total_wrote < s->hop_size) {
+    for (i = total_wrote; i < s->hop_size; i++) {
+      read_data->data[i] = 0.;
+    }
+  }
   *read = total_wrote;
 }
@@ -526 +525 @@
   uint_t end = 0;
   uint_t total_wrote = 0;
-  uint_t length = aubio_source_validate_input_length("source_wavread", s->path,
-      s->hop_size, read_data->length);
-  uint_t channels = aubio_source_validate_input_channels("source_wavread",
-      s->path, s->input_channels, read_data->height);
-  while (total_wrote < length) {
-    end = MIN(s->read_samples - s->read_index, length - total_wrote);
-    for (j = 0; j < channels; j++) {
+  while (total_wrote < s->hop_size) {
+    end = MIN(s->read_samples - s->read_index, s->hop_size - total_wrote);
+    for (j = 0; j < read_data->height; j++) {
       for (i = 0; i < end; i++) {
         read_data->data[j][i + total_wrote] =
@@ -539 +534 @@
     }
     total_wrote += end;
-    if (total_wrote < length) {
+    if (total_wrote < s->hop_size) {
       uint_t avcodec_read = 0;
       aubio_source_avcodec_readframe(s, &avcodec_read);
@@ -551 +546 @@
     }
   }
-
-  aubio_source_pad_multi_output(read_data, s->input_channels, total_wrote);
-
+  if (total_wrote < s->hop_size) {
+    for (j = 0; j < read_data->height; j++) {
+      for (i = total_wrote; i < s->hop_size; i++) {
+        read_data->data[j][i] = 0.;
+      }
+    }
+  }
   *read = total_wrote;
 }