Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor CallbackUtils.

Browse Source
This commit is contained in:
Philip Rideout
2020-08-05 15:38:31 -07:00
parent 2727cddd7a
commit dc74ee2ddc
3 changed files with 28 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
android/common/CallbackUtils.cpp
View File

@@ -16,7 +16,7 @@
#include "CallbackUtils.h"
void initCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
#ifdef ANDROID
callbackUtils.handlerClass = env->FindClass("android/os/Handler");
callbackUtils.handlerClass = (jclass) env->NewGlobalRef(callbackUtils.handlerClass);
@@ -30,6 +30,25 @@ void initCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
"execute", "(Ljava/lang/Runnable;)V");
}
void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback) {
if (handler && callback) {
#ifdef ANDROID
if (env->IsInstanceOf(handler, callbackUtils.handlerClass)) {
env->CallBooleanMethod(handler, callbackUtils.post, callback);
}
#endif
if (env->IsInstanceOf(handler, callbackUtils.executorClass)) {
env->CallVoidMethod(handler, callbackUtils.execute, callback);
}
}
env->DeleteGlobalRef(handler);
env->DeleteGlobalRef(callback);
#ifdef ANDROID
env->DeleteGlobalRef(callbackUtils.handlerClass);
#endif
env->DeleteGlobalRef(callbackUtils.executorClass);
}
JniBufferCallback* JniBufferCallback::make(filament::Engine* engine,
JNIEnv* env, jobject handler, jobject callback, AutoBuffer&& buffer) {
return new JniBufferCallback(env, handler, callback, std::move(buffer));
@@ -41,26 +60,11 @@ JniBufferCallback::JniBufferCallback(JNIEnv* env, jobject handler, jobject callb
, mHandler(env->NewGlobalRef(handler))
, mCallback(env->NewGlobalRef(callback))
, mBuffer(std::move(buffer)) {
initCallbackJni(env, mCallbackUtils);
acquireCallbackJni(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);
releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
}
void JniBufferCallback::invoke(void*, size_t, void* user) {
@@ -80,26 +84,11 @@ JniImageCallback::JniImageCallback(JNIEnv* env, jobject handler, jobject callbac
, mHandler(env->NewGlobalRef(handler))
, mCallback(env->NewGlobalRef(callback))
, mImage(image) {
initCallbackJni(env, mCallbackUtils);
acquireCallbackJni(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);
releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
}
void JniImageCallback::invoke(void*, void* user) {

3
android/common/CallbackUtils.h
View File

@@ -32,7 +32,8 @@ struct CallbackJni {
jmethodID execute;
};
void initCallbackJni(JNIEnv* env, CallbackJni& callbackUtils);
void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils);
void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback);
struct JniBufferCallback {
static JniBufferCallback* make(filament::Engine* engine,

19
android/filament-android/src/main/cpp/Texture.cpp
View File

@@ -410,7 +410,7 @@ public:
, mHandler(env->NewGlobalRef(handler))
, mCallback(env->NewGlobalRef(runnable))
{
initCallbackJni(env, mCallbackUtils);
acquireCallbackJni(env, mCallbackUtils);
if (mBitmap) {
AndroidBitmap_getInfo(mEnv, mBitmap, &mInfo);
AndroidBitmap_lockPixels(mEnv, mBitmap, &mData);
@@ -418,22 +418,7 @@ public:
}
~AutoBitmap() noexcept {
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);
releaseCallbackJni(mEnv, mCallbackUtils, mHandler, mCallback);
if (mBitmap) {
AndroidBitmap_unlockPixels(mEnv, mBitmap);
mEnv->DeleteGlobalRef(mBitmap);