RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video/out/android_common: use jni helpers 

Signed-off-by: Aman Gupta <aman@tmm1.net>
This commit is contained in:
Aman Gupta 2020-03-12 13:32:51 -07:00 committed by sfan5
parent c05e5d9d78
commit 5105a3b05a
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
video/out/android_common.c
View File

@ -20,6 +20,7 @@
#include "android_common.h"
#include "common/msg.h"
#include "misc/jni.h"
#include "options/m_config.h"
#include "vo.h"
@ -51,18 +52,18 @@ int vo_android_init(struct vo *vo)
.log = mp_log_new(ctx, vo->log, "android"),
};
jobject surface = (jobject)(intptr_t)vo->opts->WinID;
JavaVM *vm = (JavaVM *)av_jni_get_java_vm(NULL);
JNIEnv *env;
int ret = (*vm)->GetEnv(vm, (void**)&env, JNI_VERSION_1_6);
if (ret == JNI_EDETACHED) {
if ((*vm)->AttachCurrentThread(vm, &env, NULL) != 0) {
MP_FATAL(ctx, "Could not attach Java VM.\n");
JNIEnv *env = MP_JNI_GET_ENV(ctx);
if (!env) {
MP_FATAL(ctx, "Could not attach java VM.\n");
goto fail;
}
}
jobject surface = (jobject)(intptr_t)vo->opts->WinID;
ctx->native_window = ANativeWindow_fromSurface(env, surface);
(*vm)->DetachCurrentThread(vm);
if (!ctx->native_window) {
MP_FATAL(ctx, "Failed to create ANativeWindow\n");
goto fail;
}
return 1;
fail: