Changeset 422452b

Timestamp:

Jan 26, 2014, 8:19:31 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:

3cc3fd8

Parents:

a9fd272

Message:

src/io/source*: add _close function

Location:

src/io

Files:

• source.c (modified) (7 diffs)
• source.h (modified) (1 diff)
• source_apple_audio.c (modified) (1 diff)
• source_apple_audio.h (modified) (1 diff)
• source_avcodec.c (modified) (3 diffs)
• source_avcodec.h (modified) (1 diff)
• source_sndfile.c (modified) (1 diff)
• source_sndfile.h (modified) (1 diff)
• source_wavread.c (modified) (1 diff)
• source_wavread.h (modified) (1 diff)

src/io/source.c

@@ -42 +42 @@
 typedef uint_t (*aubio_source_get_channels_t)(aubio_source_t * s);
 typedef uint_t (*aubio_source_seek_t)(aubio_source_t * s, uint_t seek);
+typedef uint_t (*aubio_source_close_t)(aubio_source_t * s);
 typedef void (*del_aubio_source_t)(aubio_source_t * s);
 
@@ -51 +52 @@
   aubio_source_get_channels_t s_get_channels;
   aubio_source_seek_t s_seek;
+  aubio_source_close_t s_close;
   del_aubio_source_t s_del;
 };
@@ -64 +66 @@
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_avcodec_get_samplerate);
     s->s_seek = (aubio_source_seek_t)(aubio_source_avcodec_seek);
+    s->s_close = (aubio_source_close_t)(aubio_source_avcodec_close);
     s->s_del = (del_aubio_source_t)(del_aubio_source_avcodec);
     return s;
@@ -76 +79 @@
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_apple_audio_get_samplerate);
     s->s_seek = (aubio_source_seek_t)(aubio_source_apple_audio_seek);
+    s->s_close = (aubio_source_close_t)(aubio_source_apple_audio_close);
     s->s_del = (del_aubio_source_t)(del_aubio_source_apple_audio);
     return s;
@@ -88 +92 @@
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_sndfile_get_samplerate);
     s->s_seek = (aubio_source_seek_t)(aubio_source_sndfile_seek);
+    s->s_close = (aubio_source_close_t)(aubio_source_sndfile_close);
     s->s_del = (del_aubio_source_t)(del_aubio_source_sndfile);
     return s;
@@ -100 +105 @@
     s->s_get_samplerate = (aubio_source_get_samplerate_t)(aubio_source_wavread_get_samplerate);
     s->s_seek = (aubio_source_seek_t)(aubio_source_wavread_seek);
+    s->s_close = (aubio_source_close_t)(aubio_source_wavread_close);
     s->s_del = (del_aubio_source_t)(del_aubio_source_wavread);
     return s;
@@ -116 +122 @@
 void aubio_source_do_multi(aubio_source_t * s, fmat_t * data, uint_t * read) {
   s->s_do_multi((void *)s->source, data, read);
+}
+
+uint_t aubio_source_close(aubio_source_t * s) {
+  return s->s_close((void *)s->source);
 }
 

src/io/source.h

@@ -142 +142 @@
 /**
 
+  close source object
+
+  \param s source object, created with ::new_aubio_source
+
+  \return 0 if sucessful, non-zero on failure
+
+ */
+uint_t aubio_source_close (aubio_source_t *s);
+
+/**
+
   close source and cleanup memory
 

src/io/source_apple_audio.c

@@ -258 +258 @@
 {
   OSStatus err = noErr;
-  if (!s || !s->audioFile) { return AUBIO_FAIL; }
+  if (!s->audioFile) { return AUBIO_FAIL; }
   err = ExtAudioFileDispose(s->audioFile);
   s->audioFile = NULL;

src/io/source_apple_audio.h

@@ -122 +122 @@
 /**
 
+  close source
+
+  \param s source object, created with ::new_aubio_source_apple_audio
+
+  \return 0 if sucessful, non-zero on failure
+
+*/
+uint_t aubio_source_apple_audio_close(aubio_source_apple_audio_t * s);
+
+/**
+
   close source and cleanup memory
 

src/io/source_avcodec.c

@@ -391 +391 @@
 }
 
-void del_aubio_source_avcodec(aubio_source_avcodec_t * s){
-  if (!s) return;
-  if (s->output != NULL) {
-    av_free(s->output);
-  }
+uint_t aubio_source_avcodec_close(aubio_source_avcodec_t * s) {
   if (s->avr != NULL) {
     avresample_close( s->avr );
@@ -401 +397 @@
   }
   s->avr = NULL;
-  if (s->avFrame != NULL) {
-    avcodec_free_frame( &(s->avFrame) );
-  }
-  s->avFrame = NULL;
   if (s->avCodecCtx != NULL) {
     avcodec_close ( s->avCodecCtx );
@@ -412 +404 @@
     avformat_close_input ( &(s->avFormatCtx) );
   }
+  s->avFormatCtx = NULL;
+  return AUBIO_OK;
+}
+
+void del_aubio_source_avcodec(aubio_source_avcodec_t * s){
+  if (!s) return;
+  aubio_source_avcodec_close(s);
+  if (s->output != NULL) {
+    av_free(s->output);
+  }
+  s->output = NULL;
+  if (s->avFrame != NULL) {
+    avcodec_free_frame( &(s->avFrame) );
+  }
   s->avFrame = NULL;
-  s->avFormatCtx = NULL;
   AUBIO_FREE(s);
 }

src/io/source_avcodec.h

@@ -121 +121 @@
 /**
 
+  close source
+
+  \param s source object, created with ::new_aubio_source_avcodec
+
+  \return 0 if sucessful, non-zero on failure
+
+*/
+uint_t aubio_source_avcodec_close (aubio_source_avcodec_t *s);
+
+/**
+
   close source and cleanup memory
 

src/io/source_sndfile.c

@@ -268 +268 @@
 }
 
+uint_t aubio_source_sndfile_close (aubio_source_sndfile_t *s) {
+  if (!s->handle) {
+    return AUBIO_FAIL;
+  if(sf_close(s->handle)) {
+    AUBIO_ERR("Error closing file %s: %s", s->path, sf_strerror (NULL));
+    return AUBIO_FAIL;
+  }
+  return AUBIO_OK;
+}
+
 void del_aubio_source_sndfile(aubio_source_sndfile_t * s){
   if (!s) return;
-  if (sf_close(s->handle)) {
-    AUBIO_ERR("Error closing file %s: %s", s->path, sf_strerror (NULL));
-  }
+  aubio_source_sndfile_close(s):
 #ifdef HAVE_SAMPLERATE
   if (s->resampler != NULL) {

src/io/source_sndfile.h

@@ -121 +121 @@
 /**
 
+  close source
+
+  \param s source object, created with ::new_aubio_source_sndfile
+
+  \return 0 if sucessful, non-zero on failure
+
+*/
+uint_t aubio_source_sndfile_close (aubio_source_sndfile_t *s);
+
+/**
+
   close source and cleanup memory
 

src/io/source_wavread.c

@@ -347 +347 @@
 }
 
+uint_t aubio_source_wavread_close (aubio_source_wavread_t * s) {
+  if (!s->fid || fclose(s->fid)) {
+    return AUBIO_FAIL;
+  }
+  return AUBIO_OK;
+}
+
 void del_aubio_source_wavread(aubio_source_wavread_t * s) {
   if (!s) return;
-  if (s->fid) fclose(s->fid);
+  aubio_source_wavread_close(s);
   if (s->short_output) AUBIO_FREE(s->short_output);
   if (s->output) del_fmat(s->output);

src/io/source_wavread.h

@@ -126 +126 @@
 /**
 
+  close source
+
+  \param s source object, created with ::new_aubio_source_wavread
+
+  \return 0 if sucessful, non-zero on failure
+
+*/
+uint_t aubio_source_wavread_close (aubio_source_wavread_t *s);
+
+/**
+
   close source and cleanup memory