Skip to content

Commit

Permalink
fix: Fix Frame Processor null-dereference error (use ref-counted JNI …
Browse files Browse the repository at this point in the history
…`local_ref`) (#351)
  • Loading branch information
mrousavy committed Aug 20, 2021
1 parent cae08a1 commit d06bcf6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions android/src/main/cpp/FrameProcessorPlugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ using namespace facebook;
using namespace jni;

using TSelf = local_ref<HybridClass<FrameProcessorPlugin>::jhybriddata>;
using TFrameProcessorPlugin = jobject(alias_ref<JImageProxy::javaobject>, alias_ref<JArrayClass<jobject>>);
using TFrameProcessorPlugin = jobject(local_ref<JImageProxy::javaobject>, local_ref<JArrayClass<jobject>>);

TSelf vision::FrameProcessorPlugin::initHybrid(alias_ref<HybridClass::jhybridobject> jThis, const std::string& name) {
return makeCxxInstance(jThis, name);
Expand All @@ -24,7 +24,7 @@ void FrameProcessorPlugin::registerNatives() {
});
}

local_ref<jobject> FrameProcessorPlugin::callback(alias_ref<JImageProxy::javaobject> image, alias_ref<JArrayClass<jobject>> params) {
local_ref<jobject> FrameProcessorPlugin::callback(local_ref<JImageProxy::javaobject> image, local_ref<JArrayClass<jobject>> params) {
static const auto func = javaPart_->getClass()->getMethod<TFrameProcessorPlugin>("callback");
auto result = func(javaPart_.get(), image, params);
return make_local(result);
Expand Down
2 changes: 1 addition & 1 deletion android/src/main/cpp/FrameProcessorPlugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class FrameProcessorPlugin: public HybridClass<FrameProcessorPlugin> {
const std::string& name);
static void registerNatives();

local_ref<jobject> callback(alias_ref<JImageProxy::javaobject> image, alias_ref<JArrayClass<jobject>> params);
local_ref<jobject> callback(local_ref<JImageProxy::javaobject> image, local_ref<JArrayClass<jobject>> params);
std::string getName();

private:
Expand Down

0 comments on commit d06bcf6

Please sign in to comment.