Changeset d64f56d for src

Timestamp:

Dec 19, 2018, 3:47:31 PM (6 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

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

Children:

65628c4

Parents:

99365e9 (diff), eba24c59 (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 'feature/sink_flac' into feature/autosink

File:

• src/io/sink_flac.c (modified) (3 diffs)

src/io/sink_flac.c

@@ -64 +64 @@
   FLAC__StreamEncoder* encoder;
   FLAC__int32 *buffer;
-  FLAC__StreamMetadata *metadata[2];
+  FLAC__StreamMetadata **metadata;
 };
 
@@ -165 +165 @@
   if (!ok) {
     AUBIO_ERR("sink_flac: failed setting metadata for %s\n", s->path);
+    goto failure;
+  }
+
+  s->metadata = AUBIO_ARRAY(FLAC__StreamMetadata*, 2);
+  if (!s->metadata) {
+    AUBIO_ERR("sink_flac: failed allocating memory for %s\n", s->path);
     goto failure;
   }
@@ -324 +330 @@
   if (s->metadata) {
     // clean up metadata after stream finished
-    FLAC__metadata_object_delete(s->metadata[0]);
-    FLAC__metadata_object_delete(s->metadata[1]);
+    if (s->metadata[0])
+      FLAC__metadata_object_delete(s->metadata[0]);
+    if (s->metadata[1])
+      FLAC__metadata_object_delete(s->metadata[1]);
+    AUBIO_FREE(s->metadata);
   }