Changeset d75e2d5

Timestamp:

Dec 5, 2013, 3:20:12 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:

f3b93c6

Parents:

75eb182

Message:

src/io/source_avcodec.c: simplify, improve comments

File:

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

src/io/source_avcodec.c

@@ -74 +74 @@
   s->path = path;
 
-  // try opening the file and get some info about it
   // register all formats and codecs
   av_register_all();
 
-  // open file
+  // try opening the file and get some info about it
   AVFormatContext *avFormatCtx = s->avFormatCtx;
   avFormatCtx = NULL;
@@ -110 +109 @@
   //av_dump_format(avFormatCtx, 0, s->path, 0);
 
+  // look for the first audio stream, printing a warning if more than one is found
   uint_t i;
   sint_t selected_stream = -1;
@@ -125 +125 @@
     goto beach;
   }
-
   //AUBIO_DBG("Taking stream %d in file %s\n", selected_stream, s->path);
 
@@ -220 +219 @@
   int16_t *output = s->output;
 
-  uint_t i;
   int err = av_read_frame (avFormatCtx, &avPacket);
   if (err != 0) {
@@ -279 +277 @@
   uint_t i;
   //AUBIO_DBG("entering 'do' with %d, %d\n", s->read_samples, s->read_index);
-  // begin reading
-  if (s->read_samples == 0) {
-    uint_t avcodec_read = 0;
-    aubio_source_avcodec_readframe(s, &avcodec_read);
-    s->read_samples += avcodec_read;
-    s->read_index = 0;
-  }
   if (s->read_samples < s->hop_size) {
     // write the end of the buffer to the beginning of read_data
@@ -292 +283 @@
       read_data->data[i] = SHORT_TO_FLOAT(s->output[i + s->read_index]);
     }
-    s->read_samples = 0;
-    s->read_index = 0;
     // get more data
     uint_t avcodec_read = 0;
     aubio_source_avcodec_readframe(s, &avcodec_read);
-    s->read_samples += avcodec_read;
+    s->read_samples = avcodec_read;
     s->read_index = 0;
     // write the beginning of the buffer to the end of read_data
@@ -312 +301 @@
       }
     }
-    s->read_index += partial;
-    s->read_samples -= partial;
+    s->read_index += end - partial;
+    s->read_samples -= end - partial;
     *read = end;
   } else {