Merge branch 'release_2.17.2.0' into main

luxonis · Jul 27, 2022 · 334ba54 · 334ba54
2 parents c9abca8 + 8855548
commit 334ba54
Show file tree

Hide file tree

Showing 52 changed files with 4,197 additions and 2,918 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,11 +96,55 @@ pybind11_add_module(${TARGET_NAME}
     src/DatatypeBindings.cpp
     src/DataQueueBindings.cpp
     src/pipeline/PipelineBindings.cpp
-    src/pipeline/NodeBindings.cpp
     src/pipeline/CommonBindings.cpp
     src/pipeline/AssetManagerBindings.cpp
     src/openvino/OpenVINOBindings.cpp
     src/log/LogBindings.cpp
+
+    src/pipeline/node/NodeBindings.cpp
+
+    src/pipeline/node/XLinkInBindings.cpp
+    src/pipeline/node/XLinkOutBindings.cpp
+    src/pipeline/node/ColorCameraBindings.cpp
+    src/pipeline/node/MonoCameraBindings.cpp
+    src/pipeline/node/StereoDepthBindings.cpp
+    src/pipeline/node/NeuralNetworkBindings.cpp
+    src/pipeline/node/VideoEncoderBindings.cpp
+    src/pipeline/node/ImageManipBindings.cpp
+    src/pipeline/node/SPIOutBindings.cpp
+    src/pipeline/node/SPIInBindings.cpp
+    src/pipeline/node/DetectionNetworkBindings.cpp
+    src/pipeline/node/SystemLoggerBindings.cpp
+    src/pipeline/node/ScriptBindings.cpp
+    src/pipeline/node/SpatialLocationCalculatorBindings.cpp
+    src/pipeline/node/SpatialDetectionNetworkBindings.cpp
+    src/pipeline/node/ObjectTrackerBindings.cpp
+    src/pipeline/node/IMUBindings.cpp
+    src/pipeline/node/EdgeDetectorBindings.cpp
+    src/pipeline/node/FeatureTrackerBindings.cpp
+    src/pipeline/node/AprilTagBindings.cpp
+    src/pipeline/node/DetectionParserBindings.cpp
+
+    src/pipeline/datatype/ADatatypeBindings.cpp
+    src/pipeline/datatype/AprilTagConfigBindings.cpp
+    src/pipeline/datatype/AprilTagsBindings.cpp
+    src/pipeline/datatype/BufferBindings.cpp
+    src/pipeline/datatype/CameraControlBindings.cpp
+    src/pipeline/datatype/EdgeDetectorConfigBindings.cpp
+    src/pipeline/datatype/FeatureTrackerConfigBindings.cpp
+    src/pipeline/datatype/ImageManipConfigBindings.cpp
+    src/pipeline/datatype/ImgDetectionsBindings.cpp
+    src/pipeline/datatype/ImgFrameBindings.cpp
+    src/pipeline/datatype/IMUDataBindings.cpp
+    src/pipeline/datatype/NNDataBindings.cpp
+    src/pipeline/datatype/SpatialImgDetectionsBindings.cpp
+    src/pipeline/datatype/SpatialLocationCalculatorConfigBindings.cpp
+    src/pipeline/datatype/SpatialLocationCalculatorDataBindings.cpp
+    src/pipeline/datatype/StereoDepthConfigBindings.cpp
+    src/pipeline/datatype/SystemInformationBindings.cpp
+    src/pipeline/datatype/TrackedFeaturesBindings.cpp
+    src/pipeline/datatype/TrackletsBindings.cpp
+
 )
 
 if(WIN32)

diff --git a/depthai-core b/depthai-core
diff --git a/examples/ObjectTracker/object_tracker_video.py b/examples/ObjectTracker/object_tracker_video.py
@@ -107,7 +107,7 @@ def displayFrame(name, frame):
     cap = cv2.VideoCapture(args.videoPath)
     baseTs = time.monotonic()
     simulatedFps = 30
-    inputFrameShape = (1280, 720)
+    inputFrameShape = (1920, 1080)
 
     while cap.isOpened():
         read_correctly, frame = cap.read()

diff --git a/src/DatatypeBindings.cpp b/src/DatatypeBindings.cpp
diff --git a/src/DatatypeBindings.hpp b/src/DatatypeBindings.hpp
@@ -4,5 +4,5 @@
 #include "pybind11_common.hpp"
 
 struct DatatypeBindings {
-    static void bind(pybind11::module& m, void* pCallstack);
+    static void addToCallstack(std::deque<StackFunction>& callstack);
 };
diff --git a/src/pipeline/CommonBindings.cpp b/src/pipeline/CommonBindings.cpp
@@ -15,6 +15,8 @@
 #include "depthai-shared/common/UsbSpeed.hpp"
 #include "depthai-shared/common/DetectionNetworkType.hpp"
 #include "depthai-shared/common/DetectionParserOptions.hpp"
+#include "depthai-shared/common/RotatedRect.hpp"
+#include "depthai-shared/common/Rect.hpp"
 
 void CommonBindings::bind(pybind11::module& m, void* pCallstack){
 
@@ -39,6 +41,8 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
     py::enum_<DetectionNetworkType> detectionNetworkType(m, "DetectionNetworkType");
     py::enum_<SerializationType> serializationType(m, "SerializationType");
     py::class_<DetectionParserOptions> detectionParserOptions(m, "DetectionParserOptions", DOC(dai, DetectionParserOptions));
+    py::class_<RotatedRect> rotatedRect(m, "RotatedRect", DOC(dai, RotatedRect));
+    py::class_<Rect> rect(m, "Rect", DOC(dai, Rect));
 
     ///////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////
@@ -53,6 +57,33 @@ void CommonBindings::bind(pybind11::module& m, void* pCallstack){
     ///////////////////////////////////////////////////////////////////////
     ///////////////////////////////////////////////////////////////////////
 
+    rotatedRect
+        .def(py::init<>())
+        .def_readwrite("center", &RotatedRect::center)
+        .def_readwrite("size", &RotatedRect::size)
+        .def_readwrite("angle", &RotatedRect::angle)
+        ;
+
+    rect
+        .def(py::init<>())
+        .def(py::init<float, float, float, float>())
+        .def(py::init<Point2f, Point2f>())
+        .def(py::init<Point2f, Size2f>())
+
+        .def("topLeft", &Rect::topLeft, DOC(dai, Rect, topLeft))
+        .def("bottomRight", &Rect::bottomRight, DOC(dai, Rect, bottomRight))
+        .def("size", &Rect::size, DOC(dai, Rect, size))
+        .def("area", &Rect::area, DOC(dai, Rect, area))
+        .def("empty", &Rect::empty, DOC(dai, Rect, empty))
+        .def("contains", &Rect::contains, DOC(dai, Rect, contains))
+        .def("isNormalized", &Rect::isNormalized, DOC(dai, Rect, isNormalized))
+        .def("denormalize", &Rect::denormalize, py::arg("width"), py::arg("height"), DOC(dai, Rect, denormalize))
+        .def("normalize", &Rect::normalize, py::arg("width"), py::arg("height"), DOC(dai, Rect, normalize))
+        .def_readwrite("x", &Rect::x)
+        .def_readwrite("y", &Rect::y)
+        .def_readwrite("width", &Rect::width)
+        .def_readwrite("height", &Rect::height)
+        ;
 
     timestamp
         .def(py::init<>())
+4 −4		.github/workflows/main.workflow.yml
+1 −1		CMakeLists.txt
+1 −1		cmake/Depthai/DepthaiBootloaderConfig.cmake
+1 −1		cmake/Depthai/DepthaiDeviceSideConfig.cmake
+3 −3		examples/ObjectTracker/object_tracker_video.cpp
+7 −2		include/depthai/device/DataQueue.hpp
+3 −1		include/depthai/pipeline/datatypes.hpp
+3 −1		include/depthai/utility/Path.hpp
+4 −3		src/device/DataQueue.cpp
+1 −2		src/device/Device.cpp
+0 −2		src/pipeline/AssetManager.cpp
+4 −1		tests/CMakeLists.txt
+63 −0		tests/src/xlink_roundtrip_test.cpp