Changeset 131d1eb for src

Timestamp:

Dec 21, 2018, 8:06:09 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/crepe, fix/ffmpeg5, master

Children:

1c565c0, 59109e9

Parents:

4ed1e47 (diff), a280ed1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/sink_vorbis

Location:

src/io

Files:

• sink.c (modified) (1 diff)
• source.c (modified) (1 diff)
• source_apple_audio.c (modified) (1 diff)
• source_avcodec.c (modified) (2 diffs)
• source_sndfile.c (modified) (2 diffs)

src/io/sink.c

@@ -137 +137 @@
 void del_aubio_sink(aubio_sink_t * s) {
   AUBIO_ASSERT(s);
-  if (s->s_del && s->sink)
+  if (s && s->s_del && s->sink)
     s->s_del((void *)s->sink);
   AUBIO_FREE(s);

src/io/source.c

@@ -140 +140 @@
 void del_aubio_source(aubio_source_t * s) {
   AUBIO_ASSERT(s);
-  if (s->s_del && s->source)
+  if (s && s->s_del && s->source)
     s->s_del((void *)s->source);
   AUBIO_FREE(s);

src/io/source_apple_audio.c

@@ -345 +345 @@
         "error in ExtAudioFileGetProperty (%s)\n", s->path,
         getPrintableOSStatusError(errorstr, err));
-    return err;
+    return 0;
   }
   return (uint_t)fileLengthFrames;

src/io/source_avcodec.c

@@ -492 +492 @@
   uint_t length = aubio_source_validate_input_length("source_avcodec", s->path,
       s->hop_size, read_data->length);
+  if (!s->avr || !s->avFormatCtx || !s->avCodecCtx) {
+    AUBIO_ERR("source_avcodec: could not read from %s (file was closed)\n",
+        s->path);
+    *read= 0;
+    return;
+  }
   while (total_wrote < length) {
     end = MIN(s->read_samples - s->read_index, length - total_wrote);
@@ -530 +536 @@
   uint_t channels = aubio_source_validate_input_channels("source_avcodec",
       s->path, s->input_channels, read_data->height);
+  if (!s->avr || !s->avFormatCtx || !s->avCodecCtx) {
+    AUBIO_ERR("source_avcodec: could not read from %s (file was closed)\n",
+        s->path);
+    *read= 0;
+    return;
+  }
   while (total_wrote < length) {
     end = MIN(s->read_samples - s->read_index, length - total_wrote);

src/io/source_sndfile.c

@@ -175 +175 @@
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
       s->scratch_size);
+  if (!s->handle) {
+    AUBIO_ERR("source_sndfile: could not read from %s (file was closed)\n",
+        s->path);
+    *read = 0;
+    return;
+  }
 
   uint_t read_length = read_samples / s->input_channels;
@@ -220 +226 @@
   sf_count_t read_samples = aubio_sf_read_smpl (s->handle, s->scratch_data,
       s->scratch_size);
+  if (!s->handle) {
+    AUBIO_ERR("source_sndfile: could not read from %s (file was closed)\n",
+        s->path);
+    *read = 0;
+    return;
+  }
 
   uint_t read_length = read_samples / s->input_channels;