railbird/react-native-vision-camera
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Fix HostObject destructors to make sure a JNI Environment is set up (#2462)

Browse Source 
* fix: Fix HostObject destructors to make sure a JNI Environment is set up

* Use `reset` instead of `= nullptr`

* Format

* Format
This commit is contained in:
Marc Rousavy
2024-01-30 16:51:09 +01:00
committed by GitHub
parent 9e1297531e
commit 5f75b9e8dc
5 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
package/android/src/main/cpp/frameprocessor/FrameHostObject.cpp
View File

@@ -22,10 +22,9 @@ using namespace facebook;
FrameHostObject::FrameHostObject(const jni::alias_ref<JFrame::javaobject>& frame) : frame(make_global(frame)) {}
FrameHostObject::~FrameHostObject() {
// Hermes' Garbage Collector (Hades GC) calls destructors on a separate Thread
// which might not be attached to JNI. Ensure that we use the JNI class loader when
// deallocating the `frame` HybridClass, because otherwise JNI cannot call the Java
// destroy() function.
// Hermes GC might destroy HostObjects on an arbitrary Thread which might not be
// connected to the JNI environment. To make sure fbjni can properly destroy
// the Java method, we connect to a JNI environment first.
jni::ThreadScope::WithClassLoader([&] { frame.reset(); });
}

3
package/android/src/main/cpp/frameprocessor/FrameProcessorPluginHostObject.cpp
View File

@@ -16,6 +16,9 @@ FrameProcessorPluginHostObject::FrameProcessorPluginHostObject(jni::alias_ref<JF
: _plugin(make_global(plugin)) {}
FrameProcessorPluginHostObject::~FrameProcessorPluginHostObject() {
// Hermes GC might destroy HostObjects on an arbitrary Thread which might not be
// connected to the JNI environment. To make sure fbjni can properly destroy
// the Java method, we connect to a JNI environment first.
jni::ThreadScope::WithClassLoader([&] { _plugin.reset(); });
}

11
package/android/src/main/cpp/frameprocessor/VisionCameraProxy.cpp
View File

@@ -30,7 +30,12 @@ VisionCameraProxy::VisionCameraProxy(const jni::alias_ref<JVisionCameraProxy::ja
_javaProxy = make_global(javaProxy);
}
VisionCameraProxy::~VisionCameraProxy() {}
VisionCameraProxy::~VisionCameraProxy() {
// Hermes GC might destroy HostObjects on an arbitrary Thread which might not be
// connected to the JNI environment. To make sure fbjni can properly destroy
// the Java method, we connect to a JNI environment first.
jni::ThreadScope::WithClassLoader([&] { _javaProxy.reset(); });
}
std::vector<jsi::PropNameID> VisionCameraProxy::getPropertyNames(jsi::Runtime& runtime) {
std::vector<jsi::PropNameID> result;
@@ -96,6 +101,10 @@ jsi::Value VisionCameraProxy::get(jsi::Runtime& runtime, const jsi::PropNameID&
return jsi::Value::undefined();
}
void VisionCameraInstaller::registerNatives() {
javaClassStatic()->registerNatives({makeNativeMethod("install", VisionCameraInstaller::install)});
}
void VisionCameraInstaller::install(jni::alias_ref<jni::JClass>, jni::alias_ref<JVisionCameraProxy::javaobject> proxy) {
// global.VisionCameraProxy
auto visionCameraProxy = std::make_shared<VisionCameraProxy>(proxy);

4
package/android/src/main/cpp/frameprocessor/VisionCameraProxy.h
View File

@@ -38,9 +38,7 @@ private:
class VisionCameraInstaller : public jni::JavaClass<VisionCameraInstaller> {
public:
static auto constexpr kJavaDescriptor = "Lcom/mrousavy/camera/frameprocessor/VisionCameraInstaller;";
static void registerNatives() {
javaClassStatic()->registerNatives({makeNativeMethod("install", VisionCameraInstaller::install)});
}
static void registerNatives();
static void install(jni::alias_ref<jni::JClass> clazz, jni::alias_ref<JVisionCameraProxy::javaobject> proxy);
};