Changeset 1fe3ac2

Timestamp:

Dec 6, 2013, 5:23:08 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:

0af9003

Parents:

3d5cddf

Message:

src/io/source_avcodec.c: wrap lines, remove old comments

File:

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

src/io/source_avcodec.c

@@ -101 +101 @@
     char errorstr[errorstr_len];
     if (av_strerror (err, errorstr, errorstr_len) == 0) {
-      AUBIO_ERR("Could not find stream information for %s (%s)\n", s->path, errorstr);
-    } else {
-      AUBIO_ERR("Could not find stream information for %s (unknown error)\n", s->path);
-    }
-    goto beach;
-  }
-
-  // Dump information about file onto standard error
+      AUBIO_ERR("Could not find stream information "
+          "for %s (%s)\n", s->path, errorstr);
+    } else {
+      AUBIO_ERR("Could not find stream information "
+          "for %s (unknown error)\n", s->path);
+    }
+    goto beach;
+  }
+
+  // dump information about file onto standard error
   //av_dump_format(avFormatCtx, 0, s->path, 0);
 
-  // look for the first audio stream, printing a warning if more than one is found
+  // look for the first audio stream
   uint_t i;
   sint_t selected_stream = -1;
@@ -119 +121 @@
         selected_stream = i;
       } else {
-        AUBIO_WRN("More than one audio stream in %s, taking the first one\n", s->path);
+        AUBIO_WRN("More than one audio stream in %s, "
+            "taking the first one\n", s->path);
       }
     }
@@ -176 +179 @@
     char errorstr[errorstr_len];
     if (av_strerror (err, errorstr, errorstr_len) == 0) {
-      AUBIO_ERR("Could not open AVAudioResampleContext for %s (%s)\n", s->path, errorstr);
-    } else {
-      AUBIO_ERR("Could not open AVAudioResampleContext for %s (unknown error)\n", s->path);
+      AUBIO_ERR("Could not open AVAudioResampleContext for %s (%s)\n",
+          s->path, errorstr);
+    } else {
+      AUBIO_ERR("Could not open AVAudioResampleContext for %s (unknown error)\n",
+          s->path);
     }
     goto beach;
@@ -280 +285 @@
   //    max_out_samples, AUBIO_AVCODEC_MIN_BUFFER_SIZE);
 
-  //AUBIO_WRN("aubio_source_avcodec_readframe converted %d to %d samples\n", in_samples, out_samples);
-  //for (i = 0; i < out_samples; i ++) {
-  //  AUBIO_DBG("%f\n", SHORT_TO_FLOAT(output[i]));
-  //}
   av_free_packet(&avPacket);
   s->avFormatCtx = avFormatCtx;
@@ -293 +294 @@
   *read_samples = out_samples;
 }
-
 
 void aubio_source_avcodec_do(aubio_source_avcodec_t * s, fvec_t * read_data, uint_t * read){