[vlc-commits] android: create AWindowHandler without window
Romain Vimont
git at videolan.org
Thu Jan 14 09:41:00 UTC 2021
vlc | branch: master | Romain Vimont <rom1v at videolabs.io> | Wed Jan 13 12:07:22 2021 +0100| [1be235d4c4e663052c32de85b52dc1d6e6667998] | committer: Alexandre Janniaux
android: create AWindowHandler without window
Accept a null vout_window_t.
In the case of a decoder-only AWindowHandler decoder device, there is
no AWindow object necessary and thus no setup required, so calling the
registration functions on the AWindow would prevent any following vout
window creation since it would have been registered.
Co-authored-by: Alexandre Janniaux <ajanni at videolabs.io>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1be235d4c4e663052c32de85b52dc1d6e6667998
---
modules/video_output/android/utils.c | 44 ++++++++++++++++++++---------------
modules/video_output/android/utils.h | 2 +-
modules/video_output/android/window.c | 11 +++++----
3 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/modules/video_output/android/utils.c b/modules/video_output/android/utils.c
index 6f6d06aa65..2ad44bc922 100644
--- a/modules/video_output/android/utils.c
+++ b/modules/video_output/android/utils.c
@@ -809,35 +809,35 @@ AWindowHandler_getEnv(AWindowHandler *p_awh)
}
AWindowHandler *
-AWindowHandler_new(vout_window_t *wnd, awh_events_t *p_events)
+AWindowHandler_new(vlc_object_t *obj, vout_window_t *wnd, awh_events_t *p_events)
{
#define AWINDOW_REGISTER_FLAGS_SUCCESS 0x1
#define AWINDOW_REGISTER_FLAGS_HAS_VIDEO_LAYOUT_LISTENER 0x2
AWindowHandler *p_awh;
JNIEnv *p_env;
- JavaVM *p_jvm = var_InheritAddress(wnd, "android-jvm");
- jobject jobj = var_InheritAddress(wnd, "drawable-androidwindow");
+ JavaVM *p_jvm = var_InheritAddress(obj, "android-jvm");
+ jobject jobj = var_InheritAddress(obj, "drawable-androidwindow");
if (!p_jvm || !jobj)
{
- msg_Err(wnd, "libvlc_media_player options not set");
+ msg_Err(obj, "libvlc_media_player options not set");
return NULL;
}
p_env = android_getEnvCommon(NULL, p_jvm, "AWindowHandler");
if (!p_env)
{
- msg_Err(wnd, "can't get JNIEnv");
+ msg_Err(obj, "can't get JNIEnv");
return NULL;
}
- if (InitJNIFields(p_env, VLC_OBJECT(wnd), jobj) != VLC_SUCCESS)
+ if (InitJNIFields(p_env, obj, jobj) != VLC_SUCCESS)
{
- msg_Err(wnd, "InitJNIFields failed");
+ msg_Err(obj, "InitJNIFields failed");
return NULL;
}
- msg_Dbg(wnd, "InitJNIFields success");
+ msg_Dbg(obj, "InitJNIFields success");
p_awh = calloc(1, sizeof(AWindowHandler));
if (!p_awh)
@@ -847,7 +847,8 @@ AWindowHandler_new(vout_window_t *wnd, awh_events_t *p_events)
p_awh->jobj = (*p_env)->NewGlobalRef(p_env, jobj);
p_awh->wnd = wnd;
- p_awh->event.cb = *p_events;
+ if (p_events)
+ p_awh->event.cb = *p_events;
jfloatArray jarray = (*p_env)->NewFloatArray(p_env, 16);
if ((*p_env)->ExceptionCheck(p_env))
@@ -860,22 +861,27 @@ AWindowHandler_new(vout_window_t *wnd, awh_events_t *p_events)
(*p_env)->DeleteLocalRef(p_env, jarray);
p_awh->stex.jtransform_mtx = NULL;
- const jint flags = JNI_ANWCALL(CallIntMethod, registerNative,
- (jlong)(intptr_t)p_awh);
- if ((flags & AWINDOW_REGISTER_FLAGS_SUCCESS) == 0)
+ /* If we don't have window, don't register window handler. */
+ jint flags = 0;
+ if (p_events != NULL && wnd != NULL)
{
- msg_Err(wnd, "AWindow already registered");
- (*p_env)->DeleteGlobalRef(p_env, p_awh->jobj);
- (*p_env)->DeleteGlobalRef(p_env, p_awh->stex.jtransform_mtx_array);
- free(p_awh);
- return NULL;
+ flags = JNI_ANWCALL(CallIntMethod, registerNative,
+ (jlong)(intptr_t)p_awh);
+ if ((flags & AWINDOW_REGISTER_FLAGS_SUCCESS) == 0)
+ {
+ msg_Err(obj, "AWindow already registered");
+ (*p_env)->DeleteGlobalRef(p_env, p_awh->jobj);
+ (*p_env)->DeleteGlobalRef(p_env, p_awh->stex.jtransform_mtx_array);
+ free(p_awh);
+ return NULL;
+ }
}
LoadNativeWindowAPI(p_awh);
p_awh->b_has_video_layout_listener =
- flags & AWINDOW_REGISTER_FLAGS_HAS_VIDEO_LAYOUT_LISTENER;
+ wnd && flags & AWINDOW_REGISTER_FLAGS_HAS_VIDEO_LAYOUT_LISTENER;
- if (p_awh->b_has_video_layout_listener)
+ if (p_awh->b_has_video_layout_listener && p_events != NULL)
{
/* XXX: HACK: force mediacodec to setup an OpenGL surface when the vout
* is forced to gles2. Indeed, setting b_has_video_layout_listener to
diff --git a/modules/video_output/android/utils.h b/modules/video_output/android/utils.h
index 405f8a8b05..a9610545f3 100644
--- a/modules/video_output/android/utils.h
+++ b/modules/video_output/android/utils.h
@@ -131,7 +131,7 @@ JNIEnv *android_getEnv(vlc_object_t *p_obj, const char *psz_thread_name);
* \return a valid AWindowHandler * or NULL. It must be released with
* AWindowHandler_destroy.
*/
-AWindowHandler *AWindowHandler_new(vout_window_t *wnd, awh_events_t *p_events);
+AWindowHandler *AWindowHandler_new(vlc_object_t *obj, vout_window_t *wnd, awh_events_t *p_events);
void AWindowHandler_destroy(AWindowHandler *p_awh);
/**
diff --git a/modules/video_output/android/window.c b/modules/video_output/android/window.c
index d8e4597426..5af450ec1d 100644
--- a/modules/video_output/android/window.c
+++ b/modules/video_output/android/window.c
@@ -90,7 +90,7 @@ static const struct vout_window_operations ops = {
*/
static int Open(vout_window_t *wnd)
{
- AWindowHandler *p_awh = AWindowHandler_new(wnd,
+ AWindowHandler *p_awh = AWindowHandler_new(VLC_OBJECT(wnd), wnd,
&(awh_events_t) { OnNewWindowSize, OnNewMouseCoords });
if (p_awh == NULL)
return VLC_EGENERIC;
@@ -114,8 +114,11 @@ static void Close(vout_window_t *wnd)
static int
OpenDecDevice(vlc_decoder_device *device, vout_window_t *window)
{
- if (!window || window->type != VOUT_WINDOW_TYPE_ANDROID_NATIVE)
- return VLC_EGENERIC;
+ AWindowHandler *awh;
+ if (window && window->type == VOUT_WINDOW_TYPE_ANDROID_NATIVE)
+ awh = window->handle.anativewindow;
+ else
+ awh = AWindowHandler_new(VLC_OBJECT(device), NULL, NULL);
static const struct vlc_decoder_device_operations ops =
{
@@ -123,7 +126,7 @@ OpenDecDevice(vlc_decoder_device *device, vout_window_t *window)
};
device->ops = &ops;
device->type = VLC_DECODER_DEVICE_AWINDOW;
- device->opaque = window->handle.anativewindow;
+ device->opaque = awh;
return VLC_SUCCESS;
}
More information about the vlc-commits
mailing list