react-native-yolo 0.0.5 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Yolo.podspec +3 -0
- package/android/src/main/java/com/yolo/HybridYolo.kt +12 -235
- package/android/src/main/java/com/yolo/HybridYoloModel.kt +259 -0
- package/android/src/main/java/com/yolo/utils/BitmapOrientationFixer.kt +8 -1
- package/ios/HybridYolo.swift +52 -10
- package/ios/HybridYoloModel.swift +250 -0
- package/ios/Loader/YoloModelLoader.swift +139 -0
- package/ios/Utils/BitmapOrientationFixer.swift +64 -0
- package/ios/Utils/ContextProvider.swift +45 -0
- package/ios/Utils/FrameJpegConverter.swift +41 -0
- package/ios/Utils/FrameValidator.swift +40 -0
- package/ios/Utils/Nv12JpegEncoder.swift +58 -0
- package/ios/Utils/Yuv420ToNv12Converter.swift +71 -0
- package/lib/commonjs/index.js +4 -3
- package/lib/commonjs/index.js.map +1 -1
- package/lib/module/index.js +4 -3
- package/lib/module/index.js.map +1 -1
- package/lib/typescript/src/index.d.ts +12 -3
- package/lib/typescript/src/index.d.ts.map +1 -1
- package/lib/typescript/src/specs/yolo.nitro.d.ts +10 -6
- package/lib/typescript/src/specs/yolo.nitro.d.ts.map +1 -1
- package/nitrogen/generated/android/Yolo+autolinking.cmake +2 -0
- package/nitrogen/generated/android/YoloOnLoad.cpp +2 -0
- package/nitrogen/generated/android/c++/JHybridYoloModelSpec.cpp +78 -0
- package/nitrogen/generated/android/c++/JHybridYoloModelSpec.hpp +64 -0
- package/nitrogen/generated/android/c++/JHybridYoloSpec.cpp +9 -32
- package/nitrogen/generated/android/c++/JHybridYoloSpec.hpp +1 -3
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/yolo/HybridYoloModelSpec.kt +59 -0
- package/nitrogen/generated/android/kotlin/com/margelo/nitro/yolo/HybridYoloSpec.kt +1 -9
- package/nitrogen/generated/ios/Yolo-Swift-Cxx-Bridge.cpp +17 -0
- package/nitrogen/generated/ios/Yolo-Swift-Cxx-Bridge.hpp +48 -31
- package/nitrogen/generated/ios/Yolo-Swift-Cxx-Umbrella.hpp +5 -0
- package/nitrogen/generated/ios/c++/HybridYoloModelSpecSwift.cpp +11 -0
- package/nitrogen/generated/ios/c++/HybridYoloModelSpecSwift.hpp +97 -0
- package/nitrogen/generated/ios/c++/HybridYoloSpecSwift.hpp +6 -24
- package/nitrogen/generated/ios/swift/HybridYoloModelSpec.swift +57 -0
- package/nitrogen/generated/ios/swift/HybridYoloModelSpec_cxx.swift +160 -0
- package/nitrogen/generated/ios/swift/HybridYoloSpec.swift +1 -3
- package/nitrogen/generated/ios/swift/HybridYoloSpec_cxx.swift +8 -38
- package/nitrogen/generated/shared/c++/HybridYoloModelSpec.cpp +22 -0
- package/nitrogen/generated/shared/c++/HybridYoloModelSpec.hpp +69 -0
- package/nitrogen/generated/shared/c++/HybridYoloSpec.cpp +0 -2
- package/nitrogen/generated/shared/c++/HybridYoloSpec.hpp +5 -8
- package/package.json +1 -1
- package/src/index.ts +14 -4
- package/src/specs/yolo.nitro.ts +12 -3
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import Foundation
|
|
2
|
+
import AVFoundation
|
|
3
|
+
import NitroModules
|
|
4
|
+
import VisionCamera
|
|
5
|
+
import CoreVideo
|
|
6
|
+
|
|
7
|
+
public enum Yuv420ToNv12Converter {
|
|
8
|
+
public static func convert(frame: any HybridFrameSpec, width: Int, height: Int) -> [UInt8] {
|
|
9
|
+
do {
|
|
10
|
+
let nativeBuffer = try frame.getNativeBuffer()
|
|
11
|
+
guard let rawPointer = nativeBuffer.pointer else { return [] }
|
|
12
|
+
|
|
13
|
+
let pixelBuffer = Unmanaged<CVPixelBuffer>
|
|
14
|
+
.fromOpaque(rawPointer)
|
|
15
|
+
.takeUnretainedValue()
|
|
16
|
+
|
|
17
|
+
CVPixelBufferLockBaseAddress(pixelBuffer, .readOnly)
|
|
18
|
+
defer {
|
|
19
|
+
CVPixelBufferUnlockBaseAddress(pixelBuffer, .readOnly)
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
guard
|
|
23
|
+
let yBaseAddress = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 0),
|
|
24
|
+
let uvBaseAddress = CVPixelBufferGetBaseAddressOfPlane(pixelBuffer, 1)
|
|
25
|
+
else {
|
|
26
|
+
return []
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
let yRowStride = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 0)
|
|
30
|
+
let uvRowStride = CVPixelBufferGetBytesPerRowOfPlane(pixelBuffer, 1)
|
|
31
|
+
|
|
32
|
+
let ySize = width * height
|
|
33
|
+
let uvSize = ySize / 2
|
|
34
|
+
|
|
35
|
+
var nv12 = [UInt8](repeating: 0, count: ySize + uvSize)
|
|
36
|
+
|
|
37
|
+
nv12.withUnsafeMutableBytes { dstBuffer in
|
|
38
|
+
guard let dstBase = dstBuffer.baseAddress else { return }
|
|
39
|
+
|
|
40
|
+
let ySrc = yBaseAddress.assumingMemoryBound(to: UInt8.self)
|
|
41
|
+
let uvSrc = uvBaseAddress.assumingMemoryBound(to: UInt8.self)
|
|
42
|
+
let dst = dstBase.assumingMemoryBound(to: UInt8.self)
|
|
43
|
+
|
|
44
|
+
// 1. Copy Y Plane row-by-row to safely discard padding/stride
|
|
45
|
+
for row in 0..<height {
|
|
46
|
+
memcpy(
|
|
47
|
+
dst.advanced(by: row * width),
|
|
48
|
+
ySrc.advanced(by: row * yRowStride),
|
|
49
|
+
width
|
|
50
|
+
)
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
// 2. Copy UV Plane row-by-row safely
|
|
54
|
+
let uvDstStart = ySize
|
|
55
|
+
let chromaHeight = height / 2
|
|
56
|
+
|
|
57
|
+
for row in 0..<chromaHeight {
|
|
58
|
+
memcpy(
|
|
59
|
+
dst.advanced(by: uvDstStart + (row * width)), // Fixed layout math
|
|
60
|
+
uvSrc.advanced(by: row * uvRowStride),
|
|
61
|
+
width
|
|
62
|
+
)
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
return nv12
|
|
67
|
+
} catch {
|
|
68
|
+
return []
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
package/lib/commonjs/index.js
CHANGED
|
@@ -7,12 +7,13 @@ exports.Yolo = void 0;
|
|
|
7
7
|
var _reactNativeNitroModules = require("react-native-nitro-modules");
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
9
|
const NativeYolo = _reactNativeNitroModules.NitroModules.createHybridObject('Yolo');
|
|
10
|
-
const Yolo = exports.Yolo =
|
|
11
|
-
|
|
10
|
+
const Yolo = exports.Yolo = {
|
|
11
|
+
...NativeYolo,
|
|
12
|
+
loadModel(modelAssetId) {
|
|
12
13
|
const {
|
|
13
14
|
uri
|
|
14
15
|
} = _reactNative.Image.resolveAssetSource(modelAssetId);
|
|
15
16
|
return NativeYolo.loadModel(uri);
|
|
16
17
|
}
|
|
17
|
-
}
|
|
18
|
+
};
|
|
18
19
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNativeNitroModules","require","_reactNative","NativeYolo","NitroModules","createHybridObject","Yolo","exports","
|
|
1
|
+
{"version":3,"names":["_reactNativeNitroModules","require","_reactNative","NativeYolo","NitroModules","createHybridObject","Yolo","exports","loadModel","modelAssetId","uri","Image","resolveAssetSource"],"sourceRoot":"..\\..\\src","sources":["index.ts"],"mappings":";;;;;;AAAA,IAAAA,wBAAA,GAAAC,OAAA;AAEA,IAAAC,YAAA,GAAAD,OAAA;AAEA,MAAME,UAAU,GAAGC,qCAAY,CAACC,kBAAkB,CAAW,MAAM,CAAC;AAG7D,MAAMC,IAAI,GAAAC,OAAA,CAAAD,IAAA,GAAG;EAClB,GAAGH,UAAU;EAEbK,SAASA,CAACC,YAAoB,EAAE;IAC9B,MAAM;MAAEC;IAAI,CAAC,GAAGC,kBAAK,CAACC,kBAAkB,CAACH,YAAY,CAAC;IACtD,OAAON,UAAU,CAACK,SAAS,CAACE,GAAG,CAAC;EAClC;AACF,CAAC","ignoreList":[]}
|
package/lib/module/index.js
CHANGED
|
@@ -3,12 +3,13 @@
|
|
|
3
3
|
import { NitroModules } from 'react-native-nitro-modules';
|
|
4
4
|
import { Image } from 'react-native';
|
|
5
5
|
const NativeYolo = NitroModules.createHybridObject('Yolo');
|
|
6
|
-
export const Yolo =
|
|
7
|
-
|
|
6
|
+
export const Yolo = {
|
|
7
|
+
...NativeYolo,
|
|
8
|
+
loadModel(modelAssetId) {
|
|
8
9
|
const {
|
|
9
10
|
uri
|
|
10
11
|
} = Image.resolveAssetSource(modelAssetId);
|
|
11
12
|
return NativeYolo.loadModel(uri);
|
|
12
13
|
}
|
|
13
|
-
}
|
|
14
|
+
};
|
|
14
15
|
//# sourceMappingURL=index.js.map
|
package/lib/module/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["NitroModules","Image","NativeYolo","createHybridObject","Yolo","
|
|
1
|
+
{"version":3,"names":["NitroModules","Image","NativeYolo","createHybridObject","Yolo","loadModel","modelAssetId","uri","resolveAssetSource"],"sourceRoot":"..\\..\\src","sources":["index.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,4BAA4B;AAEzD,SAASC,KAAK,QAAQ,cAAc;AAEpC,MAAMC,UAAU,GAAGF,YAAY,CAACG,kBAAkB,CAAW,MAAM,CAAC;AAGpE,OAAO,MAAMC,IAAI,GAAG;EAClB,GAAGF,UAAU;EAEbG,SAASA,CAACC,YAAoB,EAAE;IAC9B,MAAM;MAAEC;IAAI,CAAC,GAAGN,KAAK,CAACO,kBAAkB,CAACF,YAAY,CAAC;IACtD,OAAOJ,UAAU,CAACG,SAAS,CAACE,GAAG,CAAC;EAClC;AACF,CAAC","ignoreList":[]}
|
|
@@ -1,5 +1,14 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
export declare const Yolo: {
|
|
2
|
+
loadModel(modelAssetId: number): import("./specs/yolo.nitro").YoloModel;
|
|
3
|
+
frameToBase64(frame: import("react-native-vision-camera").Frame): string;
|
|
4
|
+
__type?: string;
|
|
5
|
+
name: string;
|
|
6
|
+
toString(): string;
|
|
7
|
+
equals(other: import("react-native-nitro-modules").HybridObject<{
|
|
8
|
+
ios: "swift";
|
|
9
|
+
android: "kotlin";
|
|
10
|
+
}>): boolean;
|
|
11
|
+
dispose(): void;
|
|
4
12
|
};
|
|
13
|
+
export type { Detection, BoundingBox, YoloModel, } from './specs/yolo.nitro';
|
|
5
14
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,IAAI;4BAGS,MAAM;;;;;;;;;;CAI/B,CAAA;AACD,YAAY,EACV,SAAS,EACT,WAAW,EACX,SAAS,GACV,MAAM,oBAAoB,CAAA"}
|
|
@@ -1,24 +1,28 @@
|
|
|
1
1
|
import type { HybridObject } from 'react-native-nitro-modules';
|
|
2
2
|
import type { Frame } from 'react-native-vision-camera';
|
|
3
|
-
type Detection = {
|
|
3
|
+
export type Detection = {
|
|
4
4
|
classId: number;
|
|
5
5
|
score: number;
|
|
6
6
|
boundingBox: BoundingBox;
|
|
7
7
|
};
|
|
8
|
-
type BoundingBox = {
|
|
8
|
+
export type BoundingBox = {
|
|
9
9
|
x1: number;
|
|
10
10
|
y1: number;
|
|
11
11
|
x2: number;
|
|
12
12
|
y2: number;
|
|
13
13
|
};
|
|
14
|
+
export interface YoloModel extends HybridObject<{
|
|
15
|
+
ios: 'swift';
|
|
16
|
+
android: 'kotlin';
|
|
17
|
+
}> {
|
|
18
|
+
detect(frame: Frame): Detection[];
|
|
19
|
+
close(): void;
|
|
20
|
+
}
|
|
14
21
|
export interface Yolo extends HybridObject<{
|
|
15
22
|
ios: 'swift';
|
|
16
23
|
android: 'kotlin';
|
|
17
24
|
}> {
|
|
18
|
-
|
|
19
|
-
loadModel(modelPath: string): void;
|
|
25
|
+
loadModel(modelPath: string): YoloModel;
|
|
20
26
|
frameToBase64(frame: Frame): string;
|
|
21
|
-
detect(frame: Frame): Detection[];
|
|
22
27
|
}
|
|
23
|
-
export {};
|
|
24
28
|
//# sourceMappingURL=yolo.nitro.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"yolo.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/yolo.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEvD,
|
|
1
|
+
{"version":3,"file":"yolo.nitro.d.ts","sourceRoot":"","sources":["../../../../src/specs/yolo.nitro.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAC9D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,4BAA4B,CAAA;AAEvD,MAAM,MAAM,SAAS,GAAG;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,WAAW,CAAA;CACzB,CAAA;AACD,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;IACV,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAED,MAAM,WAAW,SAAU,SAAQ,YAAY,CAAC;IAC9C,GAAG,EAAE,OAAO,CAAA;IACZ,OAAO,EAAE,QAAQ,CAAA;CAClB,CAAC;IACA,MAAM,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,EAAE,CAAA;IACjC,KAAK,IAAI,IAAI,CAAA;CAEd;AAED,MAAM,WAAW,IAAK,SAAQ,YAAY,CAAC;IACzC,GAAG,EAAE,OAAO,CAAA;IACZ,OAAO,EAAE,QAAQ,CAAA;CAClB,CAAC;IACA,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAA;IACvC,aAAa,CAAC,KAAK,EAAE,KAAK,GAAG,MAAM,CAAA;CACpC"}
|
|
@@ -33,8 +33,10 @@ target_sources(
|
|
|
33
33
|
# Autolinking Setup
|
|
34
34
|
../nitrogen/generated/android/YoloOnLoad.cpp
|
|
35
35
|
# Shared Nitrogen C++ sources
|
|
36
|
+
../nitrogen/generated/shared/c++/HybridYoloModelSpec.cpp
|
|
36
37
|
../nitrogen/generated/shared/c++/HybridYoloSpec.cpp
|
|
37
38
|
# Android-specific Nitrogen C++ sources
|
|
39
|
+
../nitrogen/generated/android/c++/JHybridYoloModelSpec.cpp
|
|
38
40
|
../nitrogen/generated/android/c++/JHybridYoloSpec.cpp
|
|
39
41
|
)
|
|
40
42
|
|
|
@@ -15,6 +15,7 @@
|
|
|
15
15
|
#include <fbjni/fbjni.h>
|
|
16
16
|
#include <NitroModules/HybridObjectRegistry.hpp>
|
|
17
17
|
|
|
18
|
+
#include "JHybridYoloModelSpec.hpp"
|
|
18
19
|
#include "JHybridYoloSpec.hpp"
|
|
19
20
|
#include <NitroModules/DefaultConstructableObject.hpp>
|
|
20
21
|
|
|
@@ -40,6 +41,7 @@ void registerAllNatives() {
|
|
|
40
41
|
using namespace margelo::nitro::yolo;
|
|
41
42
|
|
|
42
43
|
// Register native JNI methods
|
|
44
|
+
margelo::nitro::yolo::JHybridYoloModelSpec::CxxPart::registerNatives();
|
|
43
45
|
margelo::nitro::yolo::JHybridYoloSpec::CxxPart::registerNatives();
|
|
44
46
|
|
|
45
47
|
// Register Nitro Hybrid Objects
|
|
@@ -0,0 +1,78 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// JHybridYoloModelSpec.cpp
|
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
|
+
/// https://github.com/mrousavy/nitro
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
|
+
///
|
|
7
|
+
|
|
8
|
+
#include "JHybridYoloModelSpec.hpp"
|
|
9
|
+
|
|
10
|
+
// Forward declaration of `Detection` to properly resolve imports.
|
|
11
|
+
namespace margelo::nitro::yolo { struct Detection; }
|
|
12
|
+
// Forward declaration of `BoundingBox` to properly resolve imports.
|
|
13
|
+
namespace margelo::nitro::yolo { struct BoundingBox; }
|
|
14
|
+
// Forward declaration of `HybridFrameSpec` to properly resolve imports.
|
|
15
|
+
namespace margelo::nitro::camera { class HybridFrameSpec; }
|
|
16
|
+
|
|
17
|
+
#include "Detection.hpp"
|
|
18
|
+
#include <vector>
|
|
19
|
+
#include "JDetection.hpp"
|
|
20
|
+
#include "BoundingBox.hpp"
|
|
21
|
+
#include "JBoundingBox.hpp"
|
|
22
|
+
#include <memory>
|
|
23
|
+
#include <VisionCamera/HybridFrameSpec.hpp>
|
|
24
|
+
#include <VisionCamera/JHybridFrameSpec.hpp>
|
|
25
|
+
|
|
26
|
+
namespace margelo::nitro::yolo {
|
|
27
|
+
|
|
28
|
+
std::shared_ptr<JHybridYoloModelSpec> JHybridYoloModelSpec::JavaPart::getJHybridYoloModelSpec() {
|
|
29
|
+
auto hybridObject = JHybridObject::JavaPart::getJHybridObject();
|
|
30
|
+
auto castHybridObject = std::dynamic_pointer_cast<JHybridYoloModelSpec>(hybridObject);
|
|
31
|
+
if (castHybridObject == nullptr) [[unlikely]] {
|
|
32
|
+
throw std::runtime_error("Failed to downcast JHybridObject to JHybridYoloModelSpec!");
|
|
33
|
+
}
|
|
34
|
+
return castHybridObject;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
jni::local_ref<JHybridYoloModelSpec::CxxPart::jhybriddata> JHybridYoloModelSpec::CxxPart::initHybrid(jni::alias_ref<jhybridobject> jThis) {
|
|
38
|
+
return makeCxxInstance(jThis);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
std::shared_ptr<JHybridObject> JHybridYoloModelSpec::CxxPart::createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) {
|
|
42
|
+
auto castJavaPart = jni::dynamic_ref_cast<JHybridYoloModelSpec::JavaPart>(javaPart);
|
|
43
|
+
if (castJavaPart == nullptr) [[unlikely]] {
|
|
44
|
+
throw std::runtime_error("Failed to cast JHybridObject::JavaPart to JHybridYoloModelSpec::JavaPart!");
|
|
45
|
+
}
|
|
46
|
+
return std::make_shared<JHybridYoloModelSpec>(castJavaPart);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
void JHybridYoloModelSpec::CxxPart::registerNatives() {
|
|
50
|
+
registerHybrid({
|
|
51
|
+
makeNativeMethod("initHybrid", JHybridYoloModelSpec::CxxPart::initHybrid),
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
// Properties
|
|
56
|
+
|
|
57
|
+
|
|
58
|
+
// Methods
|
|
59
|
+
std::vector<Detection> JHybridYoloModelSpec::detect(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) {
|
|
60
|
+
static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JDetection>>(jni::alias_ref<margelo::nitro::camera::JHybridFrameSpec::JavaPart> /* frame */)>("detect");
|
|
61
|
+
auto __result = method(_javaPart, std::dynamic_pointer_cast<margelo::nitro::camera::JHybridFrameSpec>(frame)->getJavaPart());
|
|
62
|
+
return [&](auto&& __input) {
|
|
63
|
+
size_t __size = __input->size();
|
|
64
|
+
std::vector<Detection> __vector;
|
|
65
|
+
__vector.reserve(__size);
|
|
66
|
+
for (size_t __i = 0; __i < __size; __i++) {
|
|
67
|
+
auto __element = __input->getElement(__i);
|
|
68
|
+
__vector.push_back(__element->toCpp());
|
|
69
|
+
}
|
|
70
|
+
return __vector;
|
|
71
|
+
}(__result);
|
|
72
|
+
}
|
|
73
|
+
void JHybridYoloModelSpec::close() {
|
|
74
|
+
static const auto method = _javaPart->javaClassStatic()->getMethod<void()>("close");
|
|
75
|
+
method(_javaPart);
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
} // namespace margelo::nitro::yolo
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// HybridYoloModelSpec.hpp
|
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
|
+
/// https://github.com/mrousavy/nitro
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
|
+
///
|
|
7
|
+
|
|
8
|
+
#pragma once
|
|
9
|
+
|
|
10
|
+
#include <NitroModules/JHybridObject.hpp>
|
|
11
|
+
#include <fbjni/fbjni.h>
|
|
12
|
+
#include "HybridYoloModelSpec.hpp"
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
namespace margelo::nitro::yolo {
|
|
18
|
+
|
|
19
|
+
using namespace facebook;
|
|
20
|
+
|
|
21
|
+
class JHybridYoloModelSpec: public virtual HybridYoloModelSpec, public virtual JHybridObject {
|
|
22
|
+
public:
|
|
23
|
+
struct JavaPart: public jni::JavaClass<JavaPart, JHybridObject::JavaPart> {
|
|
24
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/yolo/HybridYoloModelSpec;";
|
|
25
|
+
std::shared_ptr<JHybridYoloModelSpec> getJHybridYoloModelSpec();
|
|
26
|
+
};
|
|
27
|
+
struct CxxPart: public jni::HybridClass<CxxPart, JHybridObject::CxxPart> {
|
|
28
|
+
static constexpr auto kJavaDescriptor = "Lcom/margelo/nitro/yolo/HybridYoloModelSpec$CxxPart;";
|
|
29
|
+
static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject> jThis);
|
|
30
|
+
static void registerNatives();
|
|
31
|
+
using HybridBase::HybridBase;
|
|
32
|
+
protected:
|
|
33
|
+
std::shared_ptr<JHybridObject> createHybridObject(const jni::local_ref<JHybridObject::JavaPart>& javaPart) override;
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
public:
|
|
37
|
+
explicit JHybridYoloModelSpec(const jni::local_ref<JHybridYoloModelSpec::JavaPart>& javaPart):
|
|
38
|
+
HybridObject(HybridYoloModelSpec::TAG),
|
|
39
|
+
JHybridObject(javaPart),
|
|
40
|
+
_javaPart(jni::make_global(javaPart)) {}
|
|
41
|
+
~JHybridYoloModelSpec() override {
|
|
42
|
+
// Hermes GC can destroy JS objects on a non-JNI Thread.
|
|
43
|
+
jni::ThreadScope::WithClassLoader([&] { _javaPart.reset(); });
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
public:
|
|
47
|
+
inline const jni::global_ref<JHybridYoloModelSpec::JavaPart>& getJavaPart() const noexcept {
|
|
48
|
+
return _javaPart;
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
public:
|
|
52
|
+
// Properties
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
public:
|
|
56
|
+
// Methods
|
|
57
|
+
std::vector<Detection> detect(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) override;
|
|
58
|
+
void close() override;
|
|
59
|
+
|
|
60
|
+
private:
|
|
61
|
+
jni::global_ref<JHybridYoloModelSpec::JavaPart> _javaPart;
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
} // namespace margelo::nitro::yolo
|
|
@@ -7,20 +7,15 @@
|
|
|
7
7
|
|
|
8
8
|
#include "JHybridYoloSpec.hpp"
|
|
9
9
|
|
|
10
|
-
// Forward declaration of `
|
|
11
|
-
namespace margelo::nitro::yolo {
|
|
12
|
-
// Forward declaration of `BoundingBox` to properly resolve imports.
|
|
13
|
-
namespace margelo::nitro::yolo { struct BoundingBox; }
|
|
10
|
+
// Forward declaration of `HybridYoloModelSpec` to properly resolve imports.
|
|
11
|
+
namespace margelo::nitro::yolo { class HybridYoloModelSpec; }
|
|
14
12
|
// Forward declaration of `HybridFrameSpec` to properly resolve imports.
|
|
15
13
|
namespace margelo::nitro::camera { class HybridFrameSpec; }
|
|
16
14
|
|
|
17
|
-
#include <string>
|
|
18
|
-
#include "Detection.hpp"
|
|
19
|
-
#include <vector>
|
|
20
|
-
#include "JDetection.hpp"
|
|
21
|
-
#include "BoundingBox.hpp"
|
|
22
|
-
#include "JBoundingBox.hpp"
|
|
23
15
|
#include <memory>
|
|
16
|
+
#include "HybridYoloModelSpec.hpp"
|
|
17
|
+
#include "JHybridYoloModelSpec.hpp"
|
|
18
|
+
#include <string>
|
|
24
19
|
#include <VisionCamera/HybridFrameSpec.hpp>
|
|
25
20
|
#include <VisionCamera/JHybridFrameSpec.hpp>
|
|
26
21
|
|
|
@@ -57,33 +52,15 @@ namespace margelo::nitro::yolo {
|
|
|
57
52
|
|
|
58
53
|
|
|
59
54
|
// Methods
|
|
60
|
-
|
|
61
|
-
static const auto method = _javaPart->javaClassStatic()->getMethod<
|
|
62
|
-
auto __result = method(_javaPart,
|
|
63
|
-
return __result;
|
|
64
|
-
}
|
|
65
|
-
void JHybridYoloSpec::loadModel(const std::string& modelPath) {
|
|
66
|
-
static const auto method = _javaPart->javaClassStatic()->getMethod<void(jni::alias_ref<jni::JString> /* modelPath */)>("loadModel");
|
|
67
|
-
method(_javaPart, jni::make_jstring(modelPath));
|
|
55
|
+
std::shared_ptr<HybridYoloModelSpec> JHybridYoloSpec::loadModel(const std::string& modelPath) {
|
|
56
|
+
static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<JHybridYoloModelSpec::JavaPart>(jni::alias_ref<jni::JString> /* modelPath */)>("loadModel");
|
|
57
|
+
auto __result = method(_javaPart, jni::make_jstring(modelPath));
|
|
58
|
+
return __result->getJHybridYoloModelSpec();
|
|
68
59
|
}
|
|
69
60
|
std::string JHybridYoloSpec::frameToBase64(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) {
|
|
70
61
|
static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JString>(jni::alias_ref<margelo::nitro::camera::JHybridFrameSpec::JavaPart> /* frame */)>("frameToBase64");
|
|
71
62
|
auto __result = method(_javaPart, std::dynamic_pointer_cast<margelo::nitro::camera::JHybridFrameSpec>(frame)->getJavaPart());
|
|
72
63
|
return __result->toStdString();
|
|
73
64
|
}
|
|
74
|
-
std::vector<Detection> JHybridYoloSpec::detect(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) {
|
|
75
|
-
static const auto method = _javaPart->javaClassStatic()->getMethod<jni::local_ref<jni::JArrayClass<JDetection>>(jni::alias_ref<margelo::nitro::camera::JHybridFrameSpec::JavaPart> /* frame */)>("detect");
|
|
76
|
-
auto __result = method(_javaPart, std::dynamic_pointer_cast<margelo::nitro::camera::JHybridFrameSpec>(frame)->getJavaPart());
|
|
77
|
-
return [&](auto&& __input) {
|
|
78
|
-
size_t __size = __input->size();
|
|
79
|
-
std::vector<Detection> __vector;
|
|
80
|
-
__vector.reserve(__size);
|
|
81
|
-
for (size_t __i = 0; __i < __size; __i++) {
|
|
82
|
-
auto __element = __input->getElement(__i);
|
|
83
|
-
__vector.push_back(__element->toCpp());
|
|
84
|
-
}
|
|
85
|
-
return __vector;
|
|
86
|
-
}(__result);
|
|
87
|
-
}
|
|
88
65
|
|
|
89
66
|
} // namespace margelo::nitro::yolo
|
|
@@ -54,10 +54,8 @@ namespace margelo::nitro::yolo {
|
|
|
54
54
|
|
|
55
55
|
public:
|
|
56
56
|
// Methods
|
|
57
|
-
|
|
58
|
-
void loadModel(const std::string& modelPath) override;
|
|
57
|
+
std::shared_ptr<HybridYoloModelSpec> loadModel(const std::string& modelPath) override;
|
|
59
58
|
std::string frameToBase64(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) override;
|
|
60
|
-
std::vector<Detection> detect(const std::shared_ptr<margelo::nitro::camera::HybridFrameSpec>& frame) override;
|
|
61
59
|
|
|
62
60
|
private:
|
|
63
61
|
jni::global_ref<JHybridYoloSpec::JavaPart> _javaPart;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
///
|
|
2
|
+
/// HybridYoloModelSpec.kt
|
|
3
|
+
/// This file was generated by nitrogen. DO NOT MODIFY THIS FILE.
|
|
4
|
+
/// https://github.com/mrousavy/nitro
|
|
5
|
+
/// Copyright © Marc Rousavy @ Margelo
|
|
6
|
+
///
|
|
7
|
+
|
|
8
|
+
package com.margelo.nitro.yolo
|
|
9
|
+
|
|
10
|
+
import androidx.annotation.Keep
|
|
11
|
+
import com.facebook.jni.HybridData
|
|
12
|
+
import com.facebook.proguard.annotations.DoNotStrip
|
|
13
|
+
import com.margelo.nitro.camera.HybridFrameSpec
|
|
14
|
+
import com.margelo.nitro.core.HybridObject
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* A Kotlin class representing the YoloModel HybridObject.
|
|
18
|
+
* Implement this abstract class to create Kotlin-based instances of YoloModel.
|
|
19
|
+
*/
|
|
20
|
+
@DoNotStrip
|
|
21
|
+
@Keep
|
|
22
|
+
@Suppress(
|
|
23
|
+
"KotlinJniMissingFunction", "unused",
|
|
24
|
+
"RedundantSuppression", "RedundantUnitReturnType", "SimpleRedundantLet",
|
|
25
|
+
"LocalVariableName", "PropertyName", "PrivatePropertyName", "FunctionName"
|
|
26
|
+
)
|
|
27
|
+
abstract class HybridYoloModelSpec: HybridObject() {
|
|
28
|
+
// Properties
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
// Methods
|
|
32
|
+
@DoNotStrip
|
|
33
|
+
@Keep
|
|
34
|
+
abstract fun detect(frame: com.margelo.nitro.camera.HybridFrameSpec): Array<Detection>
|
|
35
|
+
|
|
36
|
+
@DoNotStrip
|
|
37
|
+
@Keep
|
|
38
|
+
abstract fun close(): Unit
|
|
39
|
+
|
|
40
|
+
// Default implementation of `HybridObject.toString()`
|
|
41
|
+
override fun toString(): String {
|
|
42
|
+
return "[HybridObject YoloModel]"
|
|
43
|
+
}
|
|
44
|
+
|
|
45
|
+
// C++ backing class
|
|
46
|
+
@DoNotStrip
|
|
47
|
+
@Keep
|
|
48
|
+
protected open class CxxPart(javaPart: HybridYoloModelSpec): HybridObject.CxxPart(javaPart) {
|
|
49
|
+
// C++ JHybridYoloModelSpec::CxxPart::initHybrid(...)
|
|
50
|
+
external override fun initHybrid(): HybridData
|
|
51
|
+
}
|
|
52
|
+
override fun createCxxPart(): CxxPart {
|
|
53
|
+
return CxxPart(this)
|
|
54
|
+
}
|
|
55
|
+
|
|
56
|
+
companion object {
|
|
57
|
+
protected const val TAG = "HybridYoloModelSpec"
|
|
58
|
+
}
|
|
59
|
+
}
|
|
@@ -31,19 +31,11 @@ abstract class HybridYoloSpec: HybridObject() {
|
|
|
31
31
|
// Methods
|
|
32
32
|
@DoNotStrip
|
|
33
33
|
@Keep
|
|
34
|
-
abstract fun
|
|
35
|
-
|
|
36
|
-
@DoNotStrip
|
|
37
|
-
@Keep
|
|
38
|
-
abstract fun loadModel(modelPath: String): Unit
|
|
34
|
+
abstract fun loadModel(modelPath: String): HybridYoloModelSpec
|
|
39
35
|
|
|
40
36
|
@DoNotStrip
|
|
41
37
|
@Keep
|
|
42
38
|
abstract fun frameToBase64(frame: com.margelo.nitro.camera.HybridFrameSpec): String
|
|
43
|
-
|
|
44
|
-
@DoNotStrip
|
|
45
|
-
@Keep
|
|
46
|
-
abstract fun detect(frame: com.margelo.nitro.camera.HybridFrameSpec): Array<Detection>
|
|
47
39
|
|
|
48
40
|
// Default implementation of `HybridObject.toString()`
|
|
49
41
|
override fun toString(): String {
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
#include "Yolo-Swift-Cxx-Bridge.hpp"
|
|
9
9
|
|
|
10
10
|
// Include C++ implementation defined types
|
|
11
|
+
#include "HybridYoloModelSpecSwift.hpp"
|
|
11
12
|
#include "HybridYoloSpecSwift.hpp"
|
|
12
13
|
#include "Yolo-Swift-Cxx-Umbrella.hpp"
|
|
13
14
|
#include <NitroModules/NitroDefines.hpp>
|
|
@@ -25,6 +26,22 @@ namespace margelo::nitro::yolo::bridge::swift {
|
|
|
25
26
|
return margelo::nitro::camera::bridge::swift::get_std__shared_ptr_HybridFrameSpec_(cppType);
|
|
26
27
|
}
|
|
27
28
|
|
|
29
|
+
// pragma MARK: std::shared_ptr<HybridYoloModelSpec>
|
|
30
|
+
std::shared_ptr<HybridYoloModelSpec> create_std__shared_ptr_HybridYoloModelSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
|
|
31
|
+
Yolo::HybridYoloModelSpec_cxx swiftPart = Yolo::HybridYoloModelSpec_cxx::fromUnsafe(swiftUnsafePointer);
|
|
32
|
+
return std::make_shared<margelo::nitro::yolo::HybridYoloModelSpecSwift>(swiftPart);
|
|
33
|
+
}
|
|
34
|
+
void* NON_NULL get_std__shared_ptr_HybridYoloModelSpec_(std__shared_ptr_HybridYoloModelSpec_ cppType) {
|
|
35
|
+
std::shared_ptr<margelo::nitro::yolo::HybridYoloModelSpecSwift> swiftWrapper = std::dynamic_pointer_cast<margelo::nitro::yolo::HybridYoloModelSpecSwift>(cppType);
|
|
36
|
+
#ifdef NITRO_DEBUG
|
|
37
|
+
if (swiftWrapper == nullptr) [[unlikely]] {
|
|
38
|
+
throw std::runtime_error("Class \"HybridYoloModelSpec\" is not implemented in Swift!");
|
|
39
|
+
}
|
|
40
|
+
#endif
|
|
41
|
+
Yolo::HybridYoloModelSpec_cxx& swiftPart = swiftWrapper->getSwiftPart();
|
|
42
|
+
return swiftPart.toUnsafe();
|
|
43
|
+
}
|
|
44
|
+
|
|
28
45
|
// pragma MARK: std::shared_ptr<HybridYoloSpec>
|
|
29
46
|
std::shared_ptr<HybridYoloSpec> create_std__shared_ptr_HybridYoloSpec_(void* NON_NULL swiftUnsafePointer) noexcept {
|
|
30
47
|
Yolo::HybridYoloSpec_cxx swiftPart = Yolo::HybridYoloSpec_cxx::fromUnsafe(swiftUnsafePointer);
|