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 +++++++++++++++++++++++++++++++++++++ video/out/android_common.h | 29 ++++++++++ video/out/opengl/context_android.c | 61 +++----------------- video/out/vo.h | 1 + wscript_build.py | 1 + 5 files changed, 153 insertions(+), 52 deletions(-) create mode 100644 video/out/android_common.c create mode 100644 video/out/android_common.h 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; +} diff --git a/video/out/android_common.h b/video/out/android_common.h new file mode 100644 index 0000000000..44f5aefe3a --- /dev/null +++ b/video/out/android_common.h @@ -0,0 +1,29 @@ +/* + * 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 . + */ + +#pragma once + +#include + +#include "common/common.h" + +struct vo; + +int vo_android_init(struct vo *vo); +void vo_android_uninit(struct vo *vo); +ANativeWindow *vo_android_native_window(struct vo *vo); +bool vo_android_surface_size(struct vo *vo, int *w, int *h); diff --git a/video/out/opengl/context_android.c b/video/out/opengl/context_android.c index d405e79fa0..bc1717c1be 100644 --- a/video/out/opengl/context_android.c +++ b/video/out/opengl/context_android.c @@ -17,35 +17,17 @@ #include #include -#include -#include +#include "video/out/android_common.h" #include "egl_helpers.h" - #include "common/common.h" -#include "options/m_config.h" #include "context.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 priv { struct GL gl; EGLDisplay egl_display; - EGLConfig egl_config; EGLContext egl_context; EGLSurface egl_surface; - ANativeWindow *native_window; }; static void android_swap_buffers(struct ra_ctx *ctx) @@ -67,28 +49,15 @@ static void android_uninit(struct ra_ctx *ctx) if (p->egl_context) eglDestroyContext(p->egl_display, p->egl_context); - if (p->native_window) { - ANativeWindow_release(p->native_window); - p->native_window = NULL; - } + vo_android_uninit(ctx->vo); } static bool android_init(struct ra_ctx *ctx) { struct priv *p = ctx->priv = talloc_zero(ctx, struct priv); - jobject surface = (jobject)(intptr_t)ctx->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; - } - } - p->native_window = ANativeWindow_fromSurface(env, surface); - (*vm)->DetachCurrentThread(vm); + if (!vo_android_init(ctx->vo)) + goto fail; p->egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); if (!eglInitialize(p->egl_display, NULL, NULL)) { @@ -100,12 +69,13 @@ static bool android_init(struct ra_ctx *ctx) if (!mpegl_create_context(ctx, p->egl_display, &p->egl_context, &config)) goto fail; + ANativeWindow *native_window = vo_android_native_window(ctx->vo); EGLint format; eglGetConfigAttrib(p->egl_display, config, EGL_NATIVE_VISUAL_ID, &format); - ANativeWindow_setBuffersGeometry(p->native_window, 0, 0, format); + ANativeWindow_setBuffersGeometry(native_window, 0, 0, format); p->egl_surface = eglCreateWindowSurface(p->egl_display, config, - (EGLNativeWindowType)p->native_window, NULL); + (EGLNativeWindowType)native_window, NULL); if (p->egl_surface == EGL_NO_SURFACE) { MP_FATAL(ctx, "Could not create EGL surface!\n"); @@ -135,26 +105,13 @@ fail: static bool android_reconfig(struct ra_ctx *ctx) { - struct priv *p = ctx->priv; - void *tmp = talloc_new(NULL); - struct android_opts *opts = mp_get_config_group(tmp, ctx->global, &android_conf); - int w = opts->surface_size.w, h = opts->surface_size.h; - - if (!w) - eglQuerySurface(p->egl_display, p->egl_surface, EGL_WIDTH, &w); - if (!h) - eglQuerySurface(p->egl_display, p->egl_surface, EGL_HEIGHT, &h); - - if (!w || !h) { - MP_FATAL(ctx, "Failed to get height and width!\n"); + int w, h; + if (!vo_android_surface_size(ctx->vo, &w, &h)) return false; - } ctx->vo->dwidth = w; ctx->vo->dheight = h; ra_gl_ctx_resize(ctx->swapchain, w, h, 0); - - talloc_free(tmp); return true; } diff --git a/video/out/vo.h b/video/out/vo.h index 57a2f39b8f..e3580db0e9 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -447,6 +447,7 @@ struct vo { struct vo_w32_state *w32; struct vo_cocoa_state *cocoa; struct vo_wayland_state *wl; + struct vo_android_state *android; struct mp_hwdec_devices *hwdec_devs; struct input_ctx *input_ctx; struct osd_state *osd; diff --git a/wscript_build.py b/wscript_build.py index 1a495fad27..ae15c4c44f 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -402,6 +402,7 @@ def build(ctx): ( "video/img_format.c" ), ( "video/mp_image.c" ), ( "video/mp_image_pool.c" ), + ( "video/out/android_common.c", "android" ), ( "video/out/aspect.c" ), ( "video/out/bitmap_packer.c" ), ( "video/out/cocoa/events_view.m", "cocoa" ), -- cgit v1.2.3