From 508e35881ebc91ff19c93c091872ea2b725ffd4d Mon Sep 17 00:00:00 2001 From: sfan5 Date: Mon, 23 Sep 2019 13:49:36 +0200 Subject: context_android: move common code to a separate file In preparation for a Vulkan Android context. This also replaces querying for EGL_WIDTH and EGL_HEIGHT with equivalent ANativeWindow calls. --- video/out/android_common.c | 113 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 113 insertions(+) create mode 100644 video/out/android_common.c (limited to 'video/out/android_common.c') diff --git a/video/out/android_common.c b/video/out/android_common.c new file mode 100644 index 0000000000..f333d56325 --- /dev/null +++ b/video/out/android_common.c @@ -0,0 +1,113 @@ +/* + * This file is part of mpv. + * + * mpv is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * mpv is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with mpv. If not, see . + */ + +#include +#include + +#include "android_common.h" +#include "common/msg.h" +#include "options/m_config.h" +#include "vo.h" + +struct android_opts { + struct m_geometry surface_size; +}; + +#define OPT_BASE_STRUCT struct android_opts +const struct m_sub_options android_conf = { + .opts = (const struct m_option[]) { + OPT_SIZE_BOX("android-surface-size", surface_size, UPDATE_VO_RESIZE), + {0} + }, + .size = sizeof(struct android_opts), +}; + + +struct vo_android_state { + struct mp_log *log; + ANativeWindow *native_window; +}; + +int vo_android_init(struct vo *vo) +{ + vo->android = talloc_zero(vo, struct vo_android_state); + struct vo_android_state *ctx = vo->android; + + *ctx = (struct vo_android_state){ + .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"); + goto fail; + } + } + ctx->native_window = ANativeWindow_fromSurface(env, surface); + (*vm)->DetachCurrentThread(vm); + + return 1; +fail: + talloc_free(ctx); + vo->android = NULL; + return 0; +} + +void vo_android_uninit(struct vo *vo) +{ + struct vo_android_state *ctx = vo->android; + if (!ctx) + return; + + if (ctx->native_window) + ANativeWindow_release(ctx->native_window); + + talloc_free(ctx); + vo->android = NULL; +} + +ANativeWindow *vo_android_native_window(struct vo *vo) +{ + struct vo_android_state *ctx = vo->android; + return ctx->native_window; +} + +bool vo_android_surface_size(struct vo *vo, int *out_w, int *out_h) +{ + struct vo_android_state *ctx = vo->android; + void *tmp = talloc_new(NULL); + struct android_opts *opts = mp_get_config_group(tmp, vo->global, &android_conf); + + int w = opts->surface_size.w, h = opts->surface_size.h; + if (!w) + w = ANativeWindow_getWidth(ctx->native_window); + if (!h) + h = ANativeWindow_getHeight(ctx->native_window); + + talloc_free(tmp); + if (w <= 0 || h <= 0) { + MP_ERR(ctx, "Failed to get height and width.\n"); + return false; + } + *out_w = w; + *out_h = h; + return true; +} -- cgit v1.2.3