Changeset 618ebd5

Timestamp:

Mar 12, 2017, 2:30:48 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

sampler

Children:

8b07fa9

Parents:

91ad284

Message:

src/io/source_avcodec.c: make thread safe using a global lock

File:

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

src/io/source_avcodec.c

@@ -53 +53 @@
 
 #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE
+
+#ifdef HAVE_PTHREAD_H
+// Global mutex to make sure avcodec_open2 is not called simultaneously in a
+// multithreaded environment. Comment the following define if no lock required.
+#define HAVE_AUBIO_AVCODEC_MUTEX
+#include <pthread.h>
+pthread_mutex_t aubio_avcodec_mutex = PTHREAD_MUTEX_INITIALIZER;
+#endif /* HAVE_PTHREAD_H */
 
 struct _aubio_source_avcodec_t {
@@ -122 +130 @@
   strncpy(s->path, path, strnlen(path, PATH_MAX) + 1);
 
+#ifdef HAVE_AUBIO_AVCODEC_MUTEX
+  pthread_mutex_lock(&aubio_avcodec_mutex);
+#endif /* HAVE_AUBIO_AVCODEC_MUTEX */
+
   // register all formats and codecs
   av_register_all();
@@ -231 +243 @@
   }
 
+#ifdef HAVE_AUBIO_AVCODEC_MUTEX
+  pthread_mutex_unlock(&aubio_avcodec_mutex);
+#endif /* HAVE_AUBIO_AVCODEC_MUTEX */
+
   /* get input specs */
   s->input_samplerate = avCodecCtx->sample_rate;
@@ -280 +296 @@
   //AUBIO_ERR("can not read %s at samplerate %dHz with a hop_size of %d\n",
   //    s->path, s->samplerate, s->hop_size);
+#ifdef HAVE_AUBIO_AVCODEC_MUTEX
+  pthread_mutex_unlock(&aubio_avcodec_mutex);
+#endif /* HAVE_AUBIO_AVCODEC_MUTEX */
   del_aubio_source_avcodec(s);
   return NULL;