Changeset 7760b40 for src/io

Timestamp:

Dec 6, 2013, 12:43:55 AM (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:

eadd8d5

Parents:

f3b93c6

Message:

src/io/source_avcodec.c: only read packets from selected stream, get correct out_samples from avresample_convert

File:

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

src/io/source_avcodec.c

@@ -58 +58 @@
   uint_t read_samples;
   uint_t read_index;
+  sint_t selected_stream;
 };
 
@@ -124 +125 @@
     goto beach;
   }
-  //AUBIO_DBG("Taking stream %d in file %s\n", selected_stream, s->path);
+  AUBIO_DBG("Taking stream %d in file %s\n", selected_stream, s->path);
+  s->selected_stream = selected_stream;
 
   AVCodecContext *avCodecCtx = s->avCodecCtx;
@@ -216 +218 @@
   int16_t *output = s->output;
 
-  int err = av_read_frame (avFormatCtx, &avPacket);
-  if (err != 0) {
-    //AUBIO_ERR("Could not read frame for (%s)\n", s->path);
-    *read_samples = 0;
-    return;
-  }
+  do
+  {
+    int err = av_read_frame (avFormatCtx, &avPacket);
+    if (err != 0) {
+      uint8_t errorstr_len = 128;
+      char errorstr[errorstr_len];
+      if (av_strerror (err, errorstr, errorstr_len) == 0) {
+        AUBIO_ERR("Could not read frame in %s (%s)\n", s->path, errorstr);
+      } else {
+        AUBIO_ERR("Could not read frame in %s (unknown error)\n", s->path);
+      }
+      *read_samples = 0;
+      return;
+    }
+  } while (avPacket.stream_index != s->selected_stream);
 
   int got_frame = 0;
@@ -244 +255 @@
   int out_plane_size = 0; //sizeof(float); //in_samples * sizeof(float);
   int max_out_samples = AUBIO_AVCODEC_MIN_BUFFER_SIZE;
-  if (avresample_convert ( avr,
+  uint_t out_samples = avresample_convert ( avr,
         (uint8_t **)&output, out_plane_size, max_out_samples,
-        (uint8_t **)avFrame->data, in_plane_size, in_samples) < 0) {
+        (uint8_t **)avFrame->data, in_plane_size, in_samples);
+  if (out_samples < 0) {
       AUBIO_ERR("Could not convert frame  (%s)\n", s->path);
+      *read_samples = 0;
   }
   //AUBIO_ERR("Got in_plane_size %d frame for (%s)\n", in_plane_size, s->path);
@@ -254 +267 @@
   //    max_out_samples, AUBIO_AVCODEC_MIN_BUFFER_SIZE);
 
-  uint_t out_samples = avresample_available(avr) + (avresample_get_delay(avr)
-        + in_samples) * s->samplerate / s->input_samplerate;
   //AUBIO_WRN("Converted %d to %d samples\n", in_samples, out_samples);
   //for (i = 0; i < out_samples; i ++) {