9b1a0e2f58
Static JNI lookups were causing issues with multiple libraries. We now do the lookups when we need them as they are effectively just hashmap lookups and we do them only in places where the work we need to perform will be much larger than a simple hash map lookup anyway. This chane also manually registers filament-utils JNI bindings to get rid of unnecessary symboles. We should do the same for other Filament libraries (the symbols are pretty long and we now have many of them).
111 lines
4.1 KiB
C++
111 lines
4.1 KiB
C++
/*
|
|
* Copyright (C) 2017 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <functional>
|
|
|
|
#include "CallbackUtils.h"
|
|
|
|
static void initCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
|
|
#ifdef ANDROID
|
|
callbackUtils.handlerClass = env->FindClass("android/os/Handler");
|
|
callbackUtils.handlerClass = (jclass) env->NewGlobalRef(callbackUtils.handlerClass);
|
|
callbackUtils.post = env->GetMethodID(callbackUtils.handlerClass,
|
|
"post", "(Ljava/lang/Runnable;)Z");
|
|
#endif
|
|
|
|
callbackUtils.executorClass = env->FindClass("java/util/concurrent/Executor");
|
|
callbackUtils.executorClass = (jclass) env->NewGlobalRef(callbackUtils.executorClass);
|
|
callbackUtils.execute = env->GetMethodID(callbackUtils.executorClass,
|
|
"execute", "(Ljava/lang/Runnable;)V");
|
|
}
|
|
|
|
JniBufferCallback* JniBufferCallback::make(filament::Engine* engine,
|
|
JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer) {
|
|
void* that = engine->streamAlloc(sizeof(JniBufferCallback), alignof(JniBufferCallback));
|
|
return new (that) JniBufferCallback(env, handler, callback, std::move(buffer));
|
|
}
|
|
|
|
JniBufferCallback::JniBufferCallback(JNIEnv* env, jobject handler, jobject callback,
|
|
AutoBuffer&& buffer)
|
|
: mEnv(env)
|
|
, mHandler(env->NewGlobalRef(handler))
|
|
, mCallback(env->NewGlobalRef(callback))
|
|
, mBuffer(std::move(buffer)) {
|
|
initCallbackJni(env, mCallbackUtils);
|
|
}
|
|
|
|
JniBufferCallback::~JniBufferCallback() {
|
|
if (mHandler && mCallback) {
|
|
#ifdef ANDROID
|
|
if (mEnv->IsInstanceOf(mHandler, mCallbackUtils.handlerClass)) {
|
|
mEnv->CallBooleanMethod(mHandler, mCallbackUtils.post, mCallback);
|
|
}
|
|
#endif
|
|
if (mEnv->IsInstanceOf(mHandler, mCallbackUtils.executorClass)) {
|
|
mEnv->CallVoidMethod(mHandler, mCallbackUtils.execute, mCallback);
|
|
}
|
|
}
|
|
mEnv->DeleteGlobalRef(mHandler);
|
|
mEnv->DeleteGlobalRef(mCallback);
|
|
#ifdef ANDROID
|
|
mEnv->DeleteGlobalRef(mCallbackUtils.handlerClass);
|
|
#endif
|
|
mEnv->DeleteGlobalRef(mCallbackUtils.executorClass);
|
|
}
|
|
|
|
void JniBufferCallback::invoke(void*, size_t, void* user) {
|
|
JniBufferCallback* data = reinterpret_cast<JniBufferCallback*>(user);
|
|
// don't call delete here, because we don't own the storage
|
|
data->~JniBufferCallback();
|
|
}
|
|
|
|
JniImageCallback* JniImageCallback::make(filament::Engine* engine,
|
|
JNIEnv* env, jobject handler, jobject callback, long image) {
|
|
void* that = engine->streamAlloc(sizeof(JniImageCallback), alignof(JniImageCallback));
|
|
return new (that) JniImageCallback(env, handler, callback, image);
|
|
}
|
|
|
|
JniImageCallback::JniImageCallback(JNIEnv* env, jobject handler, jobject callback, long image)
|
|
: mEnv(env)
|
|
, mHandler(env->NewGlobalRef(handler))
|
|
, mCallback(env->NewGlobalRef(callback))
|
|
, mImage(image) {
|
|
initCallbackJni(env, mCallbackUtils);
|
|
}
|
|
|
|
JniImageCallback::~JniImageCallback() {
|
|
if (mHandler && mCallback) {
|
|
#ifdef ANDROID
|
|
if (mEnv->IsInstanceOf(mHandler, mCallbackUtils.handlerClass)) {
|
|
mEnv->CallBooleanMethod(mHandler, mCallbackUtils.post, mCallback);
|
|
}
|
|
#endif
|
|
if (mEnv->IsInstanceOf(mHandler, mCallbackUtils.executorClass)) {
|
|
mEnv->CallVoidMethod(mHandler, mCallbackUtils.execute, mCallback);
|
|
}
|
|
}
|
|
mEnv->DeleteGlobalRef(mHandler);
|
|
mEnv->DeleteGlobalRef(mCallback);
|
|
#ifdef ANDROID
|
|
mEnv->DeleteGlobalRef(mCallbackUtils.handlerClass);
|
|
#endif
|
|
mEnv->DeleteGlobalRef(mCallbackUtils.executorClass);
|
|
}
|
|
|
|
void JniImageCallback::invoke(void*, void* user) {
|
|
reinterpret_cast<JniImageCallback*>(user)->~JniImageCallback();
|
|
}
|