Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Add warp affine transform #11

Closed
wants to merge 6 commits into from
Closed

feat: Add warp affine transform #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cf48b0d
feat: add warp affine transform
thomas-coldwell Sep 27, 2024
1963dbc
fix: remove unused
thomas-coldwell Sep 27, 2024
24e3f26
fix: add `private: true` to support yarn installs
thomas-coldwell Sep 27, 2024
a309564
fix: add scale and offset to `convertTo`
thomas-coldwell Sep 27, 2024
9c51f12
fix: wip color and format conversion
thomas-coldwell Sep 28, 2024
08ac801
fix: use index.tsx for package export
thomas-coldwell Sep 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions cpp/FOCV_Function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,13 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum

cv::transform(*src, *dst, *m);
} break;
case hashString("warpAffine", 10): {
auto src = args.asMatPtr(1);
auto dst = args.asMatPtr(2);
auto m = args.asMatPtr(3);

cv::warpAffine(*src, *dst, *m, dst->size());
} break;
case hashString("transpose", 9): {
auto src = args.asMatPtr(1);
auto dst = args.asMatPtr(2);
Expand Down Expand Up @@ -1336,13 +1343,21 @@ jsi::Object FOCV_Function::invoke(jsi::Runtime& runtime, const jsi::Value* argum
auto src = args.asMatPtr(1);
auto dst = args.asMatPtr(2);
auto rtype = args.asNumber(3);

(*src).convertTo(*dst, rtype);
double scale = 1.0;
double offset = 0.0;
if (args.asNumber(4)) {
scale = args.asNumber(4);
}
if (args.asNumber(5)) {
offset = args.asNumber(5);
}

(*src).convertTo(*dst, rtype, scale, offset);
} break;
}
} catch (cv::Exception& e) {
std::cout << "Fast OpenCV Invoke Error: " << e.what() << "\n";
}

return value;
}
}
44 changes: 21 additions & 23 deletions cpp/FOCV_Object.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ constexpr uint64_t hashString(const char* str, size_t length) {
return hash;
}

jsi::Object FOCV_Object::create(jsi::Runtime& runtime, const jsi::Value* arguments) {
jsi::Object FOCV_Object::create(jsi::Runtime& runtime, const jsi::Value* arguments, size_t argCount) {
std::string id = "";
std::string objectType = arguments[0].asString(runtime).utf8(runtime);

Expand All @@ -38,29 +38,27 @@ jsi::Object FOCV_Object::create(jsi::Runtime& runtime, const jsi::Value* argumen
int rows = arguments[1].asNumber();
int cols = arguments[2].asNumber();
int type = arguments[3].asNumber();

if(arguments[4].isObject()) {
auto rawArray = arguments[4].asObject(runtime);
auto array = rawArray.asArray(runtime);

auto rawLength = rawArray.getProperty(runtime, "length");
auto length = rawLength.asNumber();

std::vector<float> vec;

for(auto i = 0; i < length; i++) {
vec.push_back(array.getValueAtIndex(runtime, i).asNumber());
}

cv::Mat mat{vec, true};
mat = mat.reshape(1, rows);
mat.convertTo(mat, type);

id = FOCV_Storage::save(mat);
} else {
cv::Mat object(rows, cols, type);
id = FOCV_Storage::save(object);

cv::Mat mat(rows, cols, type);
memset(mat.data, 0, rows * cols * mat.elemSize1());

if (argCount == 5 && arguments[4].isObject()) {
std::vector<float> vec;
auto rawArray = arguments[4].asObject(runtime);
auto array = rawArray.asArray(runtime);

auto rawLength = rawArray.getProperty(runtime, "length");
auto length = rawLength.asNumber();

for(auto i = 0; i < length; i++) {
vec.push_back(array.getValueAtIndex(runtime, i).asNumber());
}
memcpy(mat.data, vec.data(), vec.size() * mat.elemSize1());
mat = mat.reshape(1, rows);
mat.convertTo(mat, type);
}

id = FOCV_Storage::save(mat);
} break;
case hashString("mat_vector", 10): {
std::vector<cv::Mat> object;
Expand Down
2 changes: 1 addition & 1 deletion cpp/FOCV_Object.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ using namespace facebook;

class FOCV_Object {
public:
static jsi::Object create(jsi::Runtime& runtime, const jsi::Value* arguments);
static jsi::Object create(jsi::Runtime& runtime, const jsi::Value* arguments, size_t argCount);
static jsi::Object convertToJSI(jsi::Runtime& runtime, const jsi::Value* arguments);
static jsi::Object copyObjectFromVector(jsi::Runtime& runtime, const jsi::Value* arguments);
};
Expand Down
45 changes: 30 additions & 15 deletions cpp/react-native-fast-opencv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,36 +47,51 @@ jsi::Value OpenCVPlugin::get(jsi::Runtime& runtime, const jsi::PropNameID& propN
double rows = arguments[0].asNumber();
double cols = arguments[1].asNumber();
int channels = arguments[2].asNumber();
jsi::Object input = arguments[3].asObject(runtime);
std::string dataType = arguments[3].asString(runtime).utf8(runtime);
jsi::Object input = arguments[4].asObject(runtime);

int type = -1;
if (channels == 1) {
type = CV_8U;
type = dataType == "float32" ? CV_32F : CV_8U;
}
if (channels == 3) {
type = CV_8UC3;
type = dataType == "float32" ? CV_32FC3 : CV_8UC3;
}
if (channels == 4) {
type = CV_8UC4;
type = dataType == "float32" ? CV_32FC4 : CV_8UC4;
}

if (channels == -1) {
throw std::runtime_error("Fast OpenCV Error: Invalid channel count passed to frameBufferToMat!");
}

TypedArrayKind typedArrayType = dataType == "float32" ? TypedArrayKind::Float32Array : TypedArrayKind::Uint8Array;

if (dataType == "float32") {
TypedArrayBase inputBuffer = getTypedArray(runtime, std::move(input));
auto vec = inputBuffer.toVector(runtime);

cv::Mat mat(rows, cols, type);
memcpy(mat.data, vec.data(), (int)rows * (int)cols * channels * 4);
auto id = FOCV_Storage::save(mat);

return FOCV_JsiObject::wrap(runtime, "mat", id);
}
else {
TypedArrayBase inputBuffer = getTypedArray(runtime, std::move(input));
auto vec = inputBuffer.toVector(runtime);

TypedArrayBase inputBuffer = getTypedArray(runtime, std::move(input));
auto vec = inputBuffer.toVector(runtime);

cv::Mat mat(rows, cols, type);
memcpy(mat.data, vec.data(), (int)rows * (int)cols * channels);
auto id = FOCV_Storage::save(mat);

return FOCV_JsiObject::wrap(runtime, "mat", id);
cv::Mat mat(rows, cols, type);
memcpy(mat.data, vec.data(), (int)rows * (int)cols * channels);
auto id = FOCV_Storage::save(mat);

return FOCV_JsiObject::wrap(runtime, "mat", id);
}
});
}
else if (propName == "base64ToMat") {
return jsi::Function::createFromHostFunction(
runtime, jsi::PropNameID::forAscii(runtime, "frameBufferToMat"), 1,
runtime, jsi::PropNameID::forAscii(runtime, "base64ToMat"), 1,
[=](jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments,
size_t count) -> jsi::Object {

Expand Down Expand Up @@ -123,8 +138,8 @@ jsi::Value OpenCVPlugin::get(jsi::Runtime& runtime, const jsi::PropNameID& propN
runtime, jsi::PropNameID::forAscii(runtime, "createObject"), 1,
[=](jsi::Runtime& runtime, const jsi::Value& thisValue, const jsi::Value* arguments,
size_t count) -> jsi::Object {

return FOCV_Object::create(runtime, arguments);
return FOCV_Object::create(runtime, arguments, count);
});
}
else if (propName == "toJSValue") {
Expand Down
4 changes: 2 additions & 2 deletions example/ios/FastOpencvExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = PCT6GL3GWD;
DEVELOPMENT_TEAM = TFP6882UUN;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = FastOpencvExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
Expand Down Expand Up @@ -500,7 +500,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = PCT6GL3GWD;
DEVELOPMENT_TEAM = TFP6882UUN;
INFOPLIST_FILE = FastOpencvExample/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
6 changes: 3 additions & 3 deletions example/ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,7 +936,7 @@ PODS:
- React-Mapbuffer (0.74.4):
- glog
- React-debug
- react-native-fast-opencv (0.2.4):
- react-native-fast-opencv (0.2.6):
- DoubleConversion
- glog
- hermes-engine
Expand Down Expand Up @@ -1594,7 +1594,7 @@ SPEC CHECKSUMS:
React-jsitracing: 4e9c99e73a6269b27b0d4cbab277dd90df3e5ac0
React-logger: fbfb50e2a2b1b46ee087f0a52739fadecc5e81a4
React-Mapbuffer: d39610dff659d8cf1fea485abae08bbf6f9c8279
react-native-fast-opencv: 52cb988f5dee40a599381c4617b8560977ed983c
react-native-fast-opencv: 0c318e132001e3d5be0001db561e41cb331b0984
react-native-image-picker: c3afe5472ef870d98a4b28415fc0b928161ee5f7
react-native-safe-area-context: 851c62c48dce80ccaa5637b6aa5991a1bc36eca9
react-native-skia: 8da84ea9410504bf27f0db229539a43f6caabb6a
Expand Down Expand Up @@ -1627,7 +1627,7 @@ SPEC CHECKSUMS:
SocketRocket: abac6f5de4d4d62d24e11868d7a2f427e0ef940d
vision-camera-resize-plugin: 4306d5df9bce0e603bbe6ab04337f21a606f4ad1
VisionCamera: 057aff621f7801b7d99a00d157fa39244bbd4fd2
Yoga: 6259f968a4fdf516d76a4432dead624d71aa0fb1
Yoga: 0efb3e1bd40ba59b009f01badea863281101de78

PODFILE CHECKSUM: ded8a41f26047703e900afe99b8a72ca375b02ca

Expand Down
5 changes: 5 additions & 0 deletions example/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { NavigationContainer } from '@react-navigation/native';
import { createNativeStackNavigator } from '@react-navigation/native-stack';
import { Home } from './home/Home';
import { CameraPassthrough } from './examples/CameraPassthrough';
import { CameraAffineTransform } from './examples/CameraAffineTransform';

const Stack = createNativeStackNavigator<StackParamList>();

Expand All @@ -26,6 +27,10 @@ export default function App() {
name={Route.CameraRealtimeDetection}
component={CameraRealtimeDetection}
/>
<Stack.Screen
name={Route.CameraAffineTransform}
component={CameraAffineTransform}
/>
</Stack.Navigator>
</NavigationContainer>
);
Expand Down
Loading
Loading