15 Commits

Author SHA1 Message Date
57834c9c66 augh 2023-03-09 15:42:04 +08:00
234fd8305e Fix ImageFramePacket.Get trying to get a handle that it doesn't own
Signed-off-by: Ayane <ayane@vignetteapp.org>
2023-02-28 14:27:13 +08:00
b50e3da95f Remove unsafe constructor
Signed-off-by: Ayane <ayane@vignetteapp.org>
2023-02-28 13:02:11 +08:00
0edfd693eb Update to 0.9.1 (#46)
* Begin refactor

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Begin IntPtr sweeping changes

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Implement StringPacket

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Implement StringPacket

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Remove factory class to prepare for strongly typed packets

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Finish FloatVectorPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish Anchor3DVectorPacket and BoolPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Make SerializedProto actually IDisposable

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish ClassificationListPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish ClassificationListVectorPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish DetectionPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish DetectionVectorPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish FaceGeometryPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish FaceGeometryVectorPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish FloatArrayPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Fix mismatched extern call for FloatVector

This is potentially lethal and can cause a really bad bug on use

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish FloatPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish FrameAnnotationPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish GpuBufferPacket

Converting the entirety of the GPU PInvoke code was also performed, it was unavoidable

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Update imageFrame

This is kind of butchered but we will have a span-based overload again when I feel like it

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Reintroduce the memory safe iamge handling again

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Porting ImageFrame is an act of god ong

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish ImageFramePacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish IntPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Fix pointer ambiguity in MpResourceHandle

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Let MpResourceHandle use its private property handle

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Finish LandmarkListPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish LandmarkListVectorPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish NoramlizedLandmarkListPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish MatrixPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish NormalizedRectPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish normalizedVectorRect

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish RectPacket

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finsih RectVector

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Finish all Packets

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Fixup CalculatorGraph for generic Packet types

Signed-off-by: Ayane <ayane@vignetteapp.org>

* a

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Deprecate Solutions class

As there is no maintainers for it, it doesn't seem worth keeping it for now. We will put it on it's own package instead

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Forgot to commit this 💀

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Fix more casting issues

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Make sure native methods are marshaled properly

Signed-off-by: Ayane <ayane@vignetteapp.org>

* Update some tests

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Add an even more memory safe ctor for ImageFrame

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Fix tests lmao

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Fix StringPacket not pointing to a ptr

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

* Fix incorrect test facts provided on cases

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>

---------

Signed-off-by: Ayane Satomi <ayane@vignetteapp.org>
Signed-off-by: Ayane <ayane@vignetteapp.org>
2023-02-22 14:01:27 +08:00
6e22b73a21 Update runtime 2023-02-14 18:04:57 +08:00
5e974f91b1 Change and update version spec 2023-02-14 12:38:22 +08:00
b5f3b54b15 Huge update to get on par with MediaPipeUnityPlugin (#39)
* Use new MediaPipe packages and update version

* Apply updates from MediaPipeUnityPlugin

All while keeping C pointers like `void*` instead of `IntPtr`
and various other practices.

* Add VSCode task to debug tests

* Fix unset freeHGlobal delegate

This can happen because the static code of the NativeMethods class
could have not run, for some reason...

* Fix all examples

* Fix import reordering
2022-07-30 14:37:17 +08:00
d562895694 Rewrite solutions (#33)
* Add paths for Linux in BlazePose example

* Add BlazePose example to VSCode debug launchers

* Use `pose_landmark` instead of `pose_tracking_*`

* Pluralize `SidePacket`

The correct way to call it is actually `SidePackets`,
as it is internally a `map<string, Packet>`.

* Little XML doc

* Consolidate `StartRun` method parameters

* Add `SidePackets` property to `Calculator`

* Add side packet arguments to `BlazePose`

* Use the `pose_tracking` graph

Let's try specifying side packets there instead.

* Use asynchronous SeeShark frame input

Looks like that doesn't fix the FPS...

* Remove unnecessary `unsafe`

* Better error handling in example program

* Uncomment additional SidePacket

* Implement new Packet API

* Rename `Packet` namespace to `OldPacket`

* Rename `NewPacket` namespace to `Packet`

* Actually, `Packets` is better...

* Delete old Packet API

* Replace Calculators with Solutions

Solutions are written in a way to imitate the
MediaPipe Python API as much as possible.

* Remove Old Packet API tests

* Fix remaining tests

* No more `SignalAbort` :0

* Revert "No more `SignalAbort` :0"

This reverts commit dd63b53fb53590560188d652346130ff31c74c62.

* Create `FaceMeshCpuSolution`

* Add interface

* Temporarily remove non-compiling example projects

* This solution produces segfaults...

* Create `PacketType` enum

Store packet outputs instead of packets in solution
No segfault now :D

* Use an `IDictionary` for outputs

* Create a `Hands` example

* Hand tracking is 10 times slower...

* No threading T-T

* Add `FaceMeshGpu` solution

* Avoid `free(): invalid pointer` error

* Implement `HandsGpu` solution

It works perfectly fine :D

* Start reimplementing Pose example

* Pose landmarks CPU (it's very slow)

* Just correcting some things in the examples

* Implement `PoseGpuSolution` (it's decently fast)

* `OsuFrameworkVisualTests` example works too

Though we need a way to make solutions multithreaded.

* Attempt at thread-safe `Solution` implementation

* There is no thread-safe solution. :')

This reverts commit 6e9ccca3deebf3ca74ed25c41e619c07c5febd94.

* Fix duplicate project in solution

How the fuck did that happen???
2022-07-25 23:53:06 +08:00
0388ceaa40 fix incorrect ImageFrame memory ownership handling (#29)
* fix incorrect ImageFrame memory ownership handling

* Update runtime package

* Fix PInvoke method name

* Clean ImageFrame code

* Update ImageFrameTest

* Update Mediapipe.Net package version

* Make osu!framework asynchronous

This is to compensate for the performance drop instated by this PR.
Other examples can stay as-is.
Fortunately Mediapipe handles asynchronous code perfectly well.

* Fix linting

Co-authored-by: Speykious <speykious@gmail.com>
2022-03-22 01:44:47 +08:00
7777028aec The Vignette Authors™️ 2022-01-28 12:07:37 +01:00
3371a2e745 Replace slow Marshal operations with unsafe (#13)
* Remove this bool marshal

* Literally remove all bool marshals

* Remove CharSet.Unicode warning

* Remove most FunctionPtr marshals

* Remove `[return: MarshalAs(...)]`

* Replace all `IntPtr`s with `void*`s

* Replace all `void*.Zero`s with `null`s

* Make native method classes unsafe

* U N S A F E

* Replace `PtrToStructure` with pointer arithmetic

* Run `dotnet format`

* Temp ugly Activator fix

* Remove `.ToPointer()`

* Use `byte` to return a `bool`

* Backwards compatibility with `Activator`

Yeah that sucks :(

* Replace `Marshal.Copy` by pointer arithmetic

* Replace `PtrToStringAnsi()` with `new string()`

* Remove unnecessary usings

* Explicitly type string pointers as `sbyte*`

* It actually doesn't hang?

* `MediaPipeException` -> `MediapipeException`

* Simplify `for` loops

* Remove unnecessary `float*` cast

* Some more explicit types for `ImageFrame`

* Remove unnecessary cast

* Looks like we forgor a `using` 💀

* Create `SafeArrayCopy` helper method

* Document `SafeArrayCopy`
2022-01-28 10:53:30 +01:00
54b990081f Replace methods with C# getters/setters (#11)
* timestamp

* ImageFrame + tests

* whitespace

* stream poller

* fix issue

* gpu

* core

* status
2022-01-23 02:17:36 +08:00
de5c153e2a Tiny refactorization 2022-01-21 11:22:22 +01:00
0eaa724270 Port all tests from MediaPipeUnityPlugin (#3)
* Port test attributes

* Add necessary references

* Port `TimestampTest`

* Port `CalculatorGraphTest`

* Port all `Framework.Tool` tests

* Port all `Framework.Port` tests

* Fix encoding

* Use `CharSet.Ansi` and disable warning CA2101

* Make CI run MediaPipe.NET tests

* Make `#region` names consistent

* Port all `Framework.Packet` tests

* Allow unsafe blocks

* Port `ImageFrameTest`

* Fix linting errors

* Port all `Gpu` tests

* Fix region name inconsistencies

* Fix the only GPU-side error in existence

* GPU works like a charm! (We'll have to find a way to correctly separate CPU and GPU tests.)

* `GpuOnly`: when they forgor 💀

* CI: Add tmate session for debugging

* Use corresponding runtime on tests

* Setup tmate session *after* tests

* Only setup the tmate session if previous step failed

* Fix `failure` word

* Ignore SignalAbort tests on Windows

* Circumvent OS differences for `DebugTypeName()` (Not even sure it's fine to do but anyway)

* Label some throw-exception tests as `SignalAbort`

* Maybe that's why...

* Install FFmpeg on MacOS to fix undefined symbols

* Remove MacOS test from CI

* Fix test result path
2022-01-21 08:46:28 +01:00
60653f35b5 Create Mediapipe.Net project with tests 2022-01-15 02:25:10 +01:00