Changeset f3b93c6 for src/io/source_avcodec.c

Timestamp:

Dec 5, 2013, 3:40:34 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:

7760b40

Parents:

d75e2d5

Message:

src/io/source_avcodec.c: do not reuse AVPacket for now, avoiding memory leaks

File:

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

src/io/source_avcodec.c

@@ -54 +54 @@
   AVCodecContext *avCodecCtx;
   AVFrame *avFrame;
-  AVPacket avPacket;
   AVAudioResampleContext *avr;
   int16_t *output;
@@ -185 +184 @@
     AUBIO_ERR("Could not allocate frame for (%s)\n", s->path);
   }
-  AVPacket avPacket = s->avPacket;
-  av_init_packet(&avPacket);
 
   /* allocate output for avr */
@@ -197 +194 @@
   s->avCodecCtx = avCodecCtx;
   s->avFrame = avFrame;
-  s->avPacket = avPacket;
   s->avr = avr;
 
@@ -215 +211 @@
   AVCodecContext *avCodecCtx = s->avCodecCtx;
   AVFrame *avFrame = s->avFrame;
-  AVPacket avPacket = s->avPacket;
+  AVPacket avPacket;
+  av_init_packet (&avPacket);
   AVAudioResampleContext *avr = s->avr;
   int16_t *output = s->output;
@@ -263 +260 @@
   //  AUBIO_DBG("%f\n", SHORT_TO_FLOAT(output[i]));
   //}
+  av_free_packet(&avPacket);
   s->avFormatCtx = avFormatCtx;
   s->avCodecCtx = avCodecCtx;
   s->avFrame = avFrame;
-  s->avPacket = avPacket;
   s->avr = avr;
   s->output = output;
@@ -345 +342 @@
   }
   s->avFrame = NULL;
-  if ( &(s->avPacket) != NULL) {
-    av_free_packet( &(s->avPacket) );
-  }
   if (s->avCodecCtx != NULL) {
     avcodec_close ( s->avCodecCtx );