Mirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2025-12-28 05:33:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

ALL: use new mp_thread abstraction

Browse Source
This commit is contained in:
Kacper Michajłow
2023-10-21 04:55:41 +02:00
committed by Dudemanguy
parent 3a8b107f62
commit 174df99ffa
81 changed files with 1255 additions and 1302 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
misc/jni.c
View File

@@ -22,15 +22,15 @@
#include <libavcodec/jni.h>
#include <libavutil/mem.h>
#include <libavutil/bprint.h>
#include <pthread.h>
#include <stdlib.h>
#include "jni.h"
#include "osdep/threads.h"
static JavaVM *java_vm;
static pthread_key_t current_env;
static pthread_once_t once = PTHREAD_ONCE_INIT;
static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
static mp_once once = MP_STATIC_ONCE_INITIALIZER;
static mp_static_mutex lock = MP_STATIC_MUTEX_INITIALIZER;
static void jni_detach_env(void *data)
{
@@ -49,7 +49,7 @@ JNIEnv *mp_jni_get_env(struct mp_log *log)
int ret = 0;
JNIEnv *env = NULL;
pthread_mutex_lock(&lock);
mp_mutex_lock(&lock);
if (java_vm == NULL) {
java_vm = av_jni_get_java_vm(NULL);
}
@@ -59,7 +59,7 @@ JNIEnv *mp_jni_get_env(struct mp_log *log)
goto done;
}
pthread_once(&once, jni_create_pthread_key);
mp_exec_once(&once, jni_create_pthread_key);
if ((env = pthread_getspecific(current_env)) != NULL) {
goto done;
@@ -86,7 +86,7 @@ JNIEnv *mp_jni_get_env(struct mp_log *log)
}
done:
pthread_mutex_unlock(&lock);
mp_mutex_unlock(&lock);
return env;
}