Changeset 2722dc7

Timestamp:

Aug 26, 2014, 5:24:09 AM (10 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:

79b54ea

Parents:

28c066e

Message:

src/io/source_sndfile.c: clarify some variables names

File:

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

src/io/source_sndfile.c

@@ -152 +152 @@
 void aubio_source_sndfile_do(aubio_source_sndfile_t * s, fvec_t * read_data, uint_t * read){
   uint_t i,j, input_channels = s->input_channels;
-  /* do actual reading */
+  /* read from file into scratch_data */
   sf_count_t read_samples = sf_read_float (s->handle, s->scratch_data, s->scratch_size);
 
-  smpl_t *data;
-
-#ifdef HAVE_SAMPLERATE
-  if (s->ratio != 1) {
-    data = s->input_data->data;
+  /* where to store de-interleaved data */
+  smpl_t *ptr_data;
+#ifdef HAVE_SAMPLERATE
+  if (s->ratio != 1) {
+    ptr_data = s->input_data->data;
   } else
 #endif /* HAVE_SAMPLERATE */
   {
-    data = read_data->data;
+    ptr_data = read_data->data;
   }
 
   /* de-interleaving and down-mixing data  */
   for (j = 0; j < read_samples / input_channels; j++) {
-    data[j] = 0;
+    ptr_data[j] = 0;
     for (i = 0; i < input_channels; i++) {
-      data[j] += s->scratch_data[input_channels*j+i];
-    }
-    data[j] /= (smpl_t)input_channels;
+      ptr_data[j] += s->scratch_data[input_channels*j+i];
+    }
+    ptr_data[j] /= (smpl_t)input_channels;
   }
 
@@ -196 +196 @@
   sf_count_t read_samples = sf_read_float (s->handle, s->scratch_data, s->scratch_size);
 
-  smpl_t **data;
-
+  /* where to store de-interleaved data */
+  smpl_t **ptr_data;
 #ifdef HAVE_SAMPLERATE
   if (s->ratio != 1) {
     AUBIO_ERR("source_sndfile: no multi channel resampling yet");
     return;
-    //data = s->input_data->data;
+    //ptr_data = s->input_data->data;
   } else
 #endif /* HAVE_SAMPLERATE */
   {
-    data = read_data->data;
+    ptr_data = read_data->data;
   }
 
@@ -214 +214 @@
     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];
+        ptr_data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
       }
     }
@@ -222 +222 @@
     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];
+        ptr_data[i][j] = (smpl_t)s->scratch_data[j * input_channels + i];
       }
     }
@@ -232 +232 @@
     for (j = 0; j < read_samples / input_channels; j++) {
       for (i = input_channels; i < read_data->height; i++) {
-        data[i][j] = (smpl_t)s->scratch_data[j * input_channels + (input_channels - 1)];
+        ptr_data[i][j] = (smpl_t)s->scratch_data[j * input_channels + (input_channels - 1)];
       }
     }