Changeset 8c43bf7 for src

Timestamp:

Mar 16, 2013, 3:43:37 PM (12 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:

de5d3f1

Parents:

4f872d7

Message:

src/io/source_apple_audio.c: simplify _do, downmixing

File:

• src/io/source_apple_audio.c (modified) (1 diff)

src/io/source_apple_audio.c

@@ -146 +146 @@
   if (err) { AUBIO_ERROR("error in ExtAudioFileRead, %d\n", (int)err); goto beach;}
 
+  short *data = (short*)s->bufferList.mBuffers[0].mData;
+
   smpl_t *buf = read_to->data;
 
-  short *data = (short*)s->bufferList.mBuffers[0].mData;
+  for (v = 0; v < loadedPackets; v++) {
+    buf[v] = 0.;
+    for (c = 0; c < s->channels; c++) {
+      buf[v] += SHORT_TO_FLOAT(data[ v * s->channels + c]);
+    }
+    buf[v] /= (smpl_t)s->channels;
+  }
+  // short read, fill with zeros
+  if (loadedPackets < s->block_size) {
+    for (v = loadedPackets; v < s->block_size; v++) {
+      buf[v] = 0.;
+    }
+  }
 
-  if (buf) {
-      for (c = 0; c < s->channels; c++) {
-          for (v = 0; v < s->block_size; v++) {
-              if (v < loadedPackets) {
-                  buf[v * s->channels + c] =
-                      SHORT_TO_FLOAT(data[ v * s->channels + c]);
-              } else {
-                  buf[v * s->channels + c] = 0.f;
-              }
-          }
-      }
-  }
-  //if (loadedPackets < s->block_size) return EOF;
   *read = (uint_t)loadedPackets;
   return;