diff options
| author | Matt Oliver <protogonoi@gmail.com> | 2014-05-01 19:21:29 +1000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-01 19:28:31 +0200 |
| commit | 5b9bb4d9ec0e1170ae576657208f60278500aedd (patch) | |
| tree | 9ac4995e6c36f236598e79ef12883b2803315c16 /libavutil | |
| parent | be098f6237980292c7f5c640aae638efd9e6cb11 (diff) | |
opencl: add support for non-pthread locking
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/opencl.c | 50 | ||||
| -rw-r--r-- | libavutil/opencl.h | 1 |
2 files changed, 42 insertions, 9 deletions
diff --git a/libavutil/opencl.c b/libavutil/opencl.c index f67eb5e66d..3eb0ed015e 100644 --- a/libavutil/opencl.c +++ b/libavutil/opencl.c @@ -27,15 +27,20 @@ #include "avassert.h" #include "opt.h" +#if HAVE_THREADS #if HAVE_PTHREADS - #include <pthread.h> -static pthread_mutex_t atomic_opencl_lock = PTHREAD_MUTEX_INITIALIZER; - -#define LOCK_OPENCL pthread_mutex_lock(&atomic_opencl_lock) -#define UNLOCK_OPENCL pthread_mutex_unlock(&atomic_opencl_lock) +#elif HAVE_W32THREADS +#include "compat/w32pthreads.h" +#elif HAVE_OS2THREADS +#include "compat/os2threads.h" +#endif +#include "atomic.h" -#elif !HAVE_THREADS +static pthread_mutex_t *atomic_opencl_lock = NULL; +#define LOCK_OPENCL pthread_mutex_lock(atomic_opencl_lock) +#define UNLOCK_OPENCL pthread_mutex_unlock(atomic_opencl_lock) +#else #define LOCK_OPENCL #define UNLOCK_OPENCL #endif @@ -321,9 +326,32 @@ void av_opencl_free_device_list(AVOpenCLDeviceList **device_list) av_freep(device_list); } +inline int init_opencl_mtx(void) +{ +#if HAVE_THREADS + if (!atomic_opencl_lock) { + int err; + pthread_mutex_t *tmp = av_malloc(sizeof(pthread_mutex_t)); + if (!tmp) + return AVERROR(ENOMEM); + if ((err = pthread_mutex_init(tmp, NULL))) { + av_free(tmp); + return AVERROR(err); + } + if (avpriv_atomic_ptr_cas(&atomic_opencl_lock, NULL, tmp)) { + pthread_mutex_destroy(tmp); + av_free(tmp); + } + } +#endif + return 0; +} + int av_opencl_set_option(const char *key, const char *val) { - int ret = 0; + int ret = init_opencl_mtx( ); + if (ret < 0) + return ret; LOCK_OPENCL; if (!opencl_ctx.opt_init_flag) { av_opt_set_defaults(&opencl_ctx); @@ -368,7 +396,9 @@ void av_opencl_free_external_env(AVOpenCLExternalEnv **ext_opencl_env) int av_opencl_register_kernel_code(const char *kernel_code) { - int i, ret = 0; + int i, ret = init_opencl_mtx( ); + if (ret < 0) + return ret; LOCK_OPENCL; if (opencl_ctx.kernel_code_count >= MAX_KERNEL_CODE_NUM) { av_log(&opencl_ctx, AV_LOG_ERROR, @@ -553,7 +583,9 @@ static int init_opencl_env(OpenclContext *opencl_ctx, AVOpenCLExternalEnv *ext_o int av_opencl_init(AVOpenCLExternalEnv *ext_opencl_env) { - int ret = 0; + int ret = init_opencl_mtx( ); + if (ret < 0) + return ret; LOCK_OPENCL; if (!opencl_ctx.init_count) { if (!opencl_ctx.opt_init_flag) { diff --git a/libavutil/opencl.h b/libavutil/opencl.h index cf0abd7975..9e6dc55ee8 100644 --- a/libavutil/opencl.h +++ b/libavutil/opencl.h @@ -38,6 +38,7 @@ #else #include <OpenCL/cl.h> #endif +#include <stdint.h> #include "dict.h" #include "libavutil/version.h" |