react-native-nitro-pose-exercises 1.0.4 → 1.0.6

package/android/src/main/java/com/margelo/nitro/nitroposeexercises/NitroPoseExercises.kt

@@ -1,10 +1,9 @@
 package com.margelo.nitro.nitroposeexercises
 
 import android.graphics.Bitmap
-import android.graphics.Matrix
 import androidx.annotation.Keep
 import com.facebook.proguard.annotations.DoNotStrip
-import com.google.mediapipe.framework.image.BitmapImageBuilder
+import com.google.mediapipe.framework.image.MediaImageBuilder
 import com.google.mediapipe.tasks.core.BaseOptions
 import com.google.mediapipe.tasks.vision.core.RunningMode
 import com.google.mediapipe.tasks.vision.poselandmarker.PoseLandmarker
@@ -12,7 +11,7 @@ import com.google.mediapipe.tasks.vision.poselandmarker.PoseLandmarkerOptions
 import com.margelo.nitro.NitroModules
 import com.margelo.nitro.core.Promise
 import com.margelo.nitro.camera.HybridFrameSpec
-import com.margelo.nitro.camera.NativeFrame
+import com.margelo.nitro.camera.`public`.NativeFrame
 import kotlin.math.acos
 import kotlin.math.max
 import kotlin.math.min
@@ -156,59 +155,66 @@ class HybridPoseExercise : HybridNitroPoseExercisesSpec() {
   // Frame Processing
   // ═══════════════════════════════════════════════════════════
 
-  override fun processFrame(frame: HybridFrameSpec) {
+override fun processFrame(frame: HybridFrameSpec) {
     if (_status != SessionStatus.ACTIVE && _status != SessionStatus.COUNTDOWN) return
     if (!isInitialized || poseLandmarker == null) return
 
-    // Cast to NativeFrame to get the ImageProxy
-    val nativeFrame = frame as? NativeFrame ?: return
-    val imageProxy = nativeFrame.image ?: return
-
     frameCount++
     if (frameCount % processEveryNFrames != 0) return
 
-    try {
-      // Convert ImageProxy to Bitmap
-      val bitmap = imageProxyToBitmap(imageProxy)
-      val mpImage = BitmapImageBuilder(bitmap).build()
-
-      val result = poseLandmarker!!.detect(mpImage)
-
-      if (result.landmarks().isNotEmpty()) {
-        val poseLandmarks = result.landmarks()[0]
-
-        if (poseWasLost) {
-          poseWasLost = false
-          onPoseRegained?.invoke()
-        }
+    val nativeFrame = frame as? NativeFrame ?: return
+    val imageProxy = nativeFrame.image ?: return
 
-        _landmarks = poseLandmarks.map { lm ->
-          Landmark(
-            x = lm.x().toDouble(),
-            y = lm.y().toDouble(),
-            z = lm.z().toDouble(),
-            visibility = (lm.visibility().orElse(0f)).toDouble()
-          )
-        }.toTypedArray()
-
-        if (_status == SessionStatus.ACTIVE) {
-          processExerciseLogic()
-        }
+    try {
+        val bitmapBuffer = Bitmap.createBitmap(
+            imageProxy.width,
+            imageProxy.height,
+            Bitmap.Config.ARGB_8888
+        )
 
-      } else {
-        if (!poseWasLost) {
-          poseWasLost = true
-          onPoseLost?.invoke()
+        // Use MediaPipe's BitmapImageBuilder
+        imageProxy.use {
+            val mpImage = com.google.mediapipe.framework.image.MediaImageBuilder(
+                imageProxy.image!!
+            ).build()
+
+            val result = poseLandmarker!!.detect(mpImage)
+
+            if (result.landmarks().isNotEmpty()) {
+                val poseLandmarks = result.landmarks()[0]
+
+                if (poseWasLost) {
+                    poseWasLost = false
+                    onPoseRegained?.invoke()
+                }
+
+                _landmarks = poseLandmarks.map { lm ->
+                    Landmark(
+                        x = lm.x().toDouble(),
+                        y = lm.y().toDouble(),
+                        z = lm.z().toDouble(),
+                        visibility = (lm.visibility().orElse(0f)).toDouble()
+                    )
+                }.toTypedArray()
+
+                if (_status == SessionStatus.ACTIVE) {
+                    processExerciseLogic()
+                }
+            } else {
+                if (!poseWasLost) {
+                    poseWasLost = true
+                    onPoseLost?.invoke()
+                }
+                _landmarks = emptyArray()
+            }
         }
-        _landmarks = emptyArray()
-      }
 
-      bitmap.recycle()
+        bitmapBuffer.recycle()
 
     } catch (e: Exception) {
-      // MediaPipe detection failed — skip this frame
+        // MediaPipe detection failed — skip this frame
     }
-  }
+}
 
   // ═══════════════════════════════════════════════════════════
   // ImageProxy to Bitmap conversion

package/nitrogen/generated/android/nitroposeexercises+autolinking.cmake

@@ -34,7 +34,6 @@ target_sources(
   ../nitrogen/generated/android/nitroposeexercisesOnLoad.cpp
   # Shared Nitrogen C++ sources
   ../nitrogen/generated/shared/c++/HybridNitroPoseExercisesSpec.cpp
-  ../nitrogen/generated/shared/c++/HybridWorkletQueueFactorySpec.cpp
   # Android-specific Nitrogen C++ sources
   ../nitrogen/generated/android/c++/JHybridNitroPoseExercisesSpec.cpp
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nitro-pose-exercises",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "Real-time on-device exercise tracking for React Native. Rep counting, form validation, and skeleton overlay powered by MediaPipe Pose Landmarker and VisionCamera v5 via Nitro Modules.",
   "main": "./lib/module/index.js",
   "types": "./lib/typescript/src/index.d.ts",

package/nitrogen/generated/shared/c++/HybridWorkletQueueFactorySpec.cpp

@@ -1,22 +0,0 @@
-///
-/// HybridWorkletQueueFactorySpec.cpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#include "HybridWorkletQueueFactorySpec.hpp"
-
-namespace margelo::nitro::camera::worklets {
-
-  void HybridWorkletQueueFactorySpec::loadHybridMethods() {
-    // load base methods/properties
-    HybridObject::loadHybridMethods();
-    // load custom methods/properties
-    registerHybrids(this, [](Prototype& prototype) {
-      prototype.registerHybridMethod("wrapThreadInQueue", &HybridWorkletQueueFactorySpec::wrapThreadInQueue);
-      prototype.registerHybridMethod("getCurrentThreadMarker", &HybridWorkletQueueFactorySpec::getCurrentThreadMarker);
-    });
-  }
-
-} // namespace margelo::nitro::camera::worklets

package/nitrogen/generated/shared/c++/HybridWorkletQueueFactorySpec.hpp

@@ -1,66 +0,0 @@
-///
-/// HybridWorkletQueueFactorySpec.hpp
-/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
-/// https://github.com/mrousavy/nitro
-/// Copyright © Marc Rousavy @ Margelo
-///
-
-#pragma once
-
-#if __has_include(<NitroModules/HybridObject.hpp>)
-#include <NitroModules/HybridObject.hpp>
-#else
-#error NitroModules cannot be found! Are you sure you installed NitroModules properly?
-#endif
-
-// Forward declaration of `HybridNativeThreadSpec` to properly resolve imports.
-namespace margelo::nitro::camera { class HybridNativeThreadSpec; }
-
-#include "JSIConverter+AsyncQueue.hpp"
-#include <memory>
-#include <VisionCamera/HybridNativeThreadSpec.hpp>
-
-namespace margelo::nitro::camera::worklets {
-
-  using namespace margelo::nitro;
-
-  /**
-   * An abstract base class for `WorkletQueueFactory`
-   * Inherit this class to create instances of `HybridWorkletQueueFactorySpec` in C++.
-   * You must explicitly call `HybridObject`'s constructor yourself, because it is virtual.
-   * @example
-   * ```cpp
-   * class HybridWorkletQueueFactory: public HybridWorkletQueueFactorySpec {
-   * public:
-   *   HybridWorkletQueueFactory(...): HybridObject(TAG) { ... }
-   *   // ...
-   * };
-   * ```
-   */
-  class HybridWorkletQueueFactorySpec: public virtual HybridObject {
-    public:
-      // Constructor
-      explicit HybridWorkletQueueFactorySpec(): HybridObject(TAG) { }
-
-      // Destructor
-      ~HybridWorkletQueueFactorySpec() override = default;
-
-    public:
-      // Properties
-      
-
-    public:
-      // Methods
-      virtual std::shared_ptr<::worklets::AsyncQueue> wrapThreadInQueue(const std::shared_ptr<margelo::nitro::camera::HybridNativeThreadSpec>& thread) = 0;
-      virtual double getCurrentThreadMarker() = 0;
-
-    protected:
-      // Hybrid Setup
-      void loadHybridMethods() override;
-
-    protected:
-      // Tag for logging
-      static constexpr auto TAG = "WorkletQueueFactory";
-  };
-
-} // namespace margelo::nitro::camera::worklets