perf: Remove FrameProcessorPlugin HybridClass (#467)

* Rename `JImageProxyHostObject` -> `FrameHostObject`

* `FrameProcessorPlugin` -> `JFrameProcessorPlugin` 1/2

* `FrameProcessorPlugin` -> `JFrameProcessorPlugin` 2/2

* Make `const`

* Make `getName()` instance based

* Update JFrameProcessorPlugin.h

* Update JImageProxy.h

* `T`

* T

* Remove default ctor

* Use `TSelf` again

* Return `local_ref<CameraView*>` instead of `CameraView*`

* Make `findCameraViewById` return a raw pointer again...

* Extract `setFrameProcessor` and `unsetFrameProcessor`

* Use `global_ref`

* Use `static_cast` for `FrameHostObject`

* Update FrameProcessorRuntimeManager.cpp

* Fix reference lint error

* linelength

* Fix `unsetFrameProcessor` call

android/src/main/cpp/java-bindings/JFrameProcessorPlugin.cpp

@@ -0,0 +1,30 @@
+//
+// Created by Marc Rousavy on 29.09.21.
+//
+
+#include "JFrameProcessorPlugin.h"
+
+#include <jni.h>
+#include <fbjni/fbjni.h>
+
+namespace vision {
+
+using namespace facebook;
+using namespace jni;
+
+using TCallback = jobject(alias_ref<JImageProxy::javaobject>, alias_ref<JArrayClass<jobject>>);
+
+local_ref<jobject> JFrameProcessorPlugin::callback(alias_ref<JImageProxy::javaobject> image,
+                                                   alias_ref<JArrayClass<jobject>> params) const {
+  auto callbackMethod = getClass()->getMethod<TCallback>("callback");
+
+  auto result = callbackMethod(self(), image, params);
+  return make_local(result);
+}
+
+std::string JFrameProcessorPlugin::getName() const {
+  auto getNameMethod = getClass()->getMethod<jstring()>("getName");
+  return getNameMethod(self())->toStdString();
+}
+
+} // namespace vision

android/src/main/cpp/java-bindings/JFrameProcessorPlugin.h

@@ -0,0 +1,33 @@
+//
+// Created by Marc Rousavy on 29.09.21
+//
+
+#pragma once
+
+#include <jni.h>
+#include <fbjni/fbjni.h>
+#include <string>
+
+#include "JImageProxy.h"
+
+namespace vision {
+
+using namespace facebook;
+using namespace jni;
+
+struct JFrameProcessorPlugin : public JavaClass<JFrameProcessorPlugin> {
+  static constexpr auto kJavaDescriptor = "Lcom/mrousavy/camera/frameprocessor/FrameProcessorPlugin;";
+
+ public:
+  /**
+   * Call the plugin.
+   */
+  local_ref<jobject> callback(alias_ref<JImageProxy::javaobject> image,
+                              alias_ref<JArrayClass<jobject>> params) const;
+  /**
+   * Get the user-defined name of the Frame Processor Plugin
+   */
+  std::string getName() const;
+};
+
+} // namespace vision

android/src/main/cpp/java-bindings/JImageProxy.cpp

@@ -12,12 +12,12 @@ namespace vision {
 using namespace facebook;
 using namespace jni;
 
-int JImageProxy::getWidth() {
+int JImageProxy::getWidth() const {
   static const auto getWidthMethod = getClass()->getMethod<jint()>("getWidth");
   return getWidthMethod(self());
 }
 
-int JImageProxy::getHeight() {
+int JImageProxy::getHeight() const {
   static const auto getWidthMethod = getClass()->getMethod<jint()>("getHeight");
   return getWidthMethod(self());
 }
@@ -27,19 +27,19 @@ alias_ref<JClass> getUtilsClass() {
   return ImageProxyUtilsClass;
 }
 
-bool JImageProxy::getIsValid() {
+bool JImageProxy::getIsValid() const {
   auto utilsClass = getUtilsClass();
   static const auto isImageProxyValidMethod = utilsClass->getStaticMethod<jboolean(JImageProxy::javaobject)>("isImageProxyValid");
   return isImageProxyValidMethod(utilsClass, self());
 }
 
-int JImageProxy::getPlanesCount() {
+int JImageProxy::getPlanesCount() const {
   auto utilsClass = getUtilsClass();
   static const auto getPlanesCountMethod = utilsClass->getStaticMethod<jint(JImageProxy::javaobject)>("getPlanesCount");
   return getPlanesCountMethod(utilsClass, self());
 }
 
-int JImageProxy::getBytesPerRow() {
+int JImageProxy::getBytesPerRow() const {
   auto utilsClass = getUtilsClass();
   static const auto getBytesPerRowMethod = utilsClass->getStaticMethod<jint(JImageProxy::javaobject)>("getBytesPerRow");
   return getBytesPerRowMethod(utilsClass, self());

android/src/main/cpp/java-bindings/JImageProxy.h

@@ -9,15 +9,18 @@
 
 namespace vision {
 
-struct JImageProxy : public facebook::jni::JavaClass<JImageProxy> {
+using namespace facebook;
+using namespace jni;
+
+struct JImageProxy : public JavaClass<JImageProxy> {
   static constexpr auto kJavaDescriptor = "Landroidx/camera/core/ImageProxy;";
 
  public:
-  int getWidth();
-  int getHeight();
-  bool getIsValid();
-  int getPlanesCount();
-  int getBytesPerRow();
+  int getWidth() const;
+  int getHeight() const;
+  bool getIsValid() const;
+  int getPlanesCount() const;
+  int getBytesPerRow() const;
   void close();
 };
 

android/src/main/cpp/java-bindings/JImageProxyHostObject.cpp

@@ -1,100 +0,0 @@
-//
-// Created by Marc on 19/06/2021.
-//
-
-#include "JImageProxyHostObject.h"
-#include <android/log.h>
-#include <fbjni/fbjni.h>
-#include <jni.h>
-#include <vector>
-#include <string>
-
-namespace vision {
-
-using namespace facebook;
-
-JImageProxyHostObject::JImageProxyHostObject(jni::alias_ref<JImageProxy::javaobject> image): frame(make_local(image)) { }
-
-JImageProxyHostObject::~JImageProxyHostObject() {
-  // 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.
-  jni::ThreadScope::WithClassLoader([=] { frame.reset(); });
-}
-
-std::vector<jsi::PropNameID> JImageProxyHostObject::getPropertyNames(jsi::Runtime& rt) {
-  std::vector<jsi::PropNameID> result;
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("toString")));
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("isValid")));
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("width")));
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("height")));
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("bytesPerRow")));
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("planesCount")));
-  result.push_back(jsi::PropNameID::forUtf8(rt, std::string("close")));
-  return result;
-}
-
-jsi::Value JImageProxyHostObject::get(jsi::Runtime& runtime, const jsi::PropNameID& propNameId) {
-  auto name = propNameId.utf8(runtime);
-
-  if (name == "toString") {
-    auto toString = [this] (jsi::Runtime& runtime, const jsi::Value&, const jsi::Value*, size_t) -> jsi::Value {
-      if (!this->frame) {
-        return jsi::String::createFromUtf8(runtime, "[closed frame]");
-      }
-      auto width = this->frame->getWidth();
-      auto height = this->frame->getHeight();
-      auto str = std::to_string(width) + " x " + std::to_string(height) + " Frame";
-      return jsi::String::createFromUtf8(runtime, str);
-    };
-    return jsi::Function::createFromHostFunction(runtime, jsi::PropNameID::forUtf8(runtime, "toString"), 0, toString);
-  }
-  if (name == "close") {
-    auto close = [this] (jsi::Runtime& runtime, const jsi::Value&, const jsi::Value*, size_t) -> jsi::Value {
-      if (!this->frame) {
-        throw jsi::JSError(runtime, "Trying to close an already closed frame! Did you call frame.close() twice?");
-      }
-      this->close();
-      return jsi::Value::undefined();
-    };
-    return jsi::Function::createFromHostFunction(runtime, jsi::PropNameID::forUtf8(runtime, "close"), 0, close);
-  }
-
-  if (name == "isValid") {
-    return jsi::Value(this->frame && this->frame->getIsValid());
-  }
-  if (name == "width") {
-    this->assertIsFrameStrong(runtime, name);
-    return jsi::Value(this->frame->getWidth());
-  }
-  if (name == "height") {
-    this->assertIsFrameStrong(runtime, name);
-    return jsi::Value(this->frame->getHeight());
-  }
-  if (name == "bytesPerRow") {
-    this->assertIsFrameStrong(runtime, name);
-    return jsi::Value(this->frame->getBytesPerRow());
-  }
-  if (name == "planesCount") {
-    this->assertIsFrameStrong(runtime, name);
-    return jsi::Value(this->frame->getPlanesCount());
-  }
-
-  return jsi::Value::undefined();
-}
-
-void JImageProxyHostObject::assertIsFrameStrong(jsi::Runtime& runtime, const std::string& accessedPropName) const {
-  if (!this->frame) {
-    auto message = "Cannot get `" + accessedPropName + "`, frame is already closed!";
-    throw jsi::JSError(runtime, message.c_str());
-  }
-}
-
-void JImageProxyHostObject::close() {
-  if (this->frame) {
-    this->frame->close();
-  }
-}
-
-} // namespace vision

android/src/main/cpp/java-bindings/JImageProxyHostObject.h

@@ -1,39 +0,0 @@
-//
-// Created by Marc on 19/06/2021.
-//
-
-#pragma once
-
-#include <jsi/jsi.h>
-#include <jni.h>
-#include <fbjni/fbjni.h>
-#include <vector>
-#include <string>
-
-#include "JImageProxy.h"
-
-namespace vision {
-
-using namespace facebook;
-
-class JSI_EXPORT JImageProxyHostObject : public jsi::HostObject {
- public:
-  explicit JImageProxyHostObject(jni::alias_ref<JImageProxy::javaobject> image);
-  ~JImageProxyHostObject();
-
- public:
-  jsi::Value get(jsi::Runtime &, const jsi::PropNameID &name) override;
-  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime &rt) override;
-
-  void close();
-
- public:
-  jni::local_ref<JImageProxy> frame;
-
- private:
-  static auto constexpr TAG = "VisionCamera";
-
-  void assertIsFrameStrong(jsi::Runtime& runtime, const std::string& accessedPropName) const; // NOLINT(runtime/references)
-};
-
-} // namespace vision