* Upgrade presets for OpenCV 4.5.4, DepthAI 2.11.0

bytedeco · Oct 16, 2021 · fb4bba0 · fb4bba0
1 parent 54baae5
commit fb4bba0
Show file tree

Hide file tree

Showing 915 changed files with 3,773 additions and 1,415 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,7 @@
  * Map C++ JIT classes and functions of TorchScript in presets for PyTorch ([issue #1068](https://github.com/bytedeco/javacpp-presets/issues/1068))
  * Synchronize `cachePackage()` and prevent repeated package caching in all presets ([pull #1071](https://github.com/bytedeco/javacpp-presets/pull/1071))
  * Build FFmpeg with VA-API enabled and bundle its libraries to avoid loading issues ([issue bytedeco/javacv#1188](https://github.com/bytedeco/javacv/issues/1188))
- * Upgrade presets for Arrow 5.0.0, MKL 2021.4, DNNL 2.4.1, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.2, SciPy 1.7.1, Gym 0.21.0, LLVM 13.0.0, Leptonica 1.82.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.9.1, TensorFlow Lite 2.6.0, ALE 0.7.2, DepthAI 2.10.0, ONNX 1.10.1, ONNX Runtime 1.9.1, and their dependencies
+ * Upgrade presets for OpenCV 4.5.4, Arrow 5.0.0, MKL 2021.4, DNNL 2.4.1, OpenBLAS 0.3.18, FFTW 3.3.10, CPython 3.10.0, NumPy 1.21.2, SciPy 1.7.1, Gym 0.21.0, LLVM 13.0.0, Leptonica 1.82.0, CUDA 11.4.2, cuDNN 8.2.4, NCCL 2.11.4, PyTorch 1.9.1, TensorFlow Lite 2.6.0, ALE 0.7.2, DepthAI 2.11.0, ONNX 1.10.1, ONNX Runtime 1.9.1, and their dependencies
 
 ### August 2, 2021 version 1.5.6
  * Change `opencv_core.Mat` constructors to create column vectors out of arrays for consistency ([issue #1064](https://github.com/bytedeco/javacpp-presets/issues/1064))

diff --git a/README.md b/README.md
@@ -169,7 +169,7 @@ The JavaCPP Presets depend on Maven, a powerful build system for Java, so before
 
 Each child module in turn relies by default on the included [`cppbuild.sh` scripts](#the-cppbuildsh-scripts), explained below, to install its corresponding native libraries in the `cppbuild` subdirectory. To use native libraries already installed somewhere else on the system, other installation directories than `cppbuild` can also be specified either in the `pom.xml` files or in the `.java` configuration files. The following versions are supported:
 
- * OpenCV 4.5.3  https://opencv.org/releases.html
+ * OpenCV 4.5.4  https://opencv.org/releases.html
  * FFmpeg 4.4.x  http://ffmpeg.org/download.html
  * FlyCapture 2.13.x  https://www.flir.com/products/flycapture-sdk
  * Spinnaker 2.4.x https://www.flir.com/products/spinnaker-sdk
@@ -215,7 +215,7 @@ Each child module in turn relies by default on the included [`cppbuild.sh` scrip
  * TensorFlow Lite 2.6.x  https://github.com/tensorflow/tensorflow
  * TensorRT 8.x  https://developer.nvidia.com/tensorrt
  * The Arcade Learning Environment 0.7.x  https://github.com/mgbellemare/Arcade-Learning-Environment
- * DepthAI 2.10.x  https://github.com/luxonis/depthai-core
+ * DepthAI 2.11.x  https://github.com/luxonis/depthai-core
  * ONNX 1.10.x  https://github.com/onnx/onnx
  * nGraph 0.26.0  https://github.com/NervanaSystems/ngraph
  * ONNX Runtime 1.9.x  https://github.com/microsoft/onnxruntime

diff --git a/caffe/platform/gpu/pom.xml b/caffe/platform/gpu/pom.xml
@@ -24,7 +24,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/caffe/platform/pom.xml b/caffe/platform/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>

diff --git a/caffe/pom.xml b/caffe/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -51,7 +51,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.5.3-${project.parent.version}</version>
+            <version>4.5.4-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -66,7 +66,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.5.3-${project.parent.version}</version>
+            <version>4.5.4-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
           <dependency>

diff --git a/chilitags/platform/pom.xml b/chilitags/platform/pom.xml
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>

diff --git a/chilitags/pom.xml b/chilitags/pom.xml
@@ -18,7 +18,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>org.bytedeco</groupId>
@@ -46,7 +46,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.5.3-${project.parent.version}</version>
+            <version>4.5.4-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -57,7 +57,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.5.3-${project.parent.version}</version>
+            <version>4.5.4-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/depthai/README.md b/depthai/README.md
@@ -9,7 +9,7 @@ Introduction
 ------------
 This directory contains the JavaCPP Presets module for:
 
- * DepthAI 2.10.0  https://luxonis.com/depthai
+ * DepthAI 2.11.0  https://luxonis.com/depthai
 
 Please refer to the parent README.md file for more detailed information about the JavaCPP Presets.
 
@@ -46,12 +46,12 @@ We can use [Maven 3](http://maven.apache.org/) to download and install automatic
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>depthai-platform</artifactId>
-            <version>2.10.0-1.5.7-SNAPSHOT</version>
+            <version>2.11.0-1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv-platform</artifactId>
-            <version>4.5.3-1.5.7-SNAPSHOT</version>
+            <version>4.5.4-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/depthai/cppbuild.sh b/depthai/cppbuild.sh
@@ -7,7 +7,7 @@ if [[ -z "$PLATFORM" ]]; then
     exit
 fi
 
-DEPTHAI_VERSION=2.10.0
+DEPTHAI_VERSION=2.11.0
 LIBUSB_VERSION=1.0.22
 download https://github.com/luxonis/depthai-core/releases/download/v$DEPTHAI_VERSION/depthai-core-v$DEPTHAI_VERSION.tar.gz depthai-core-v$DEPTHAI_VERSION.tar.gz
 download http://sourceforge.net/projects/libusb/files/libusb-1.0/libusb-$LIBUSB_VERSION/libusb-$LIBUSB_VERSION.tar.bz2/download libusb-$LIBUSB_VERSION.tar.bz2

diff --git a/depthai/platform/pom.xml b/depthai/platform/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>depthai-platform</artifactId>
-  <version>2.10.0-${project.parent.version}</version>
+  <version>2.11.0-${project.parent.version}</version>
   <name>JavaCPP Presets Platform for DepthAI</name>
 
   <properties>
@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv-platform</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
     </dependency>
      <dependency>
        <groupId>org.bytedeco</groupId>

diff --git a/depthai/pom.xml b/depthai/pom.xml
@@ -11,14 +11,14 @@
 
   <groupId>org.bytedeco</groupId>
   <artifactId>depthai</artifactId>
-  <version>2.10.0-${project.parent.version}</version>
+  <version>2.11.0-${project.parent.version}</version>
   <name>JavaCPP Presets for DepthAI</name>
 
   <dependencies>
     <dependency>
       <groupId>org.bytedeco</groupId>
       <artifactId>opencv</artifactId>
-      <version>4.5.3-${project.parent.version}</version>
+      <version>4.5.4-${project.parent.version}</version>
       <optional>true</optional>
     </dependency>
     <dependency>
@@ -47,7 +47,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.5.3-${project.parent.version}</version>
+            <version>4.5.4-${project.parent.version}</version>
           </dependency>
           <dependency>
             <groupId>org.bytedeco</groupId>
@@ -58,7 +58,7 @@
           <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv</artifactId>
-            <version>4.5.3-${project.parent.version}</version>
+            <version>4.5.4-${project.parent.version}</version>
             <classifier>${javacpp.platform}</classifier>
           </dependency>
         </dependencies>

diff --git a/depthai/samples/pom.xml b/depthai/samples/pom.xml
@@ -12,12 +12,12 @@
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>depthai-platform</artifactId>
-            <version>2.10.0-1.5.7-SNAPSHOT</version>
+            <version>2.11.0-1.5.7-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.bytedeco</groupId>
             <artifactId>opencv-platform</artifactId>
-            <version>4.5.3-1.5.7-SNAPSHOT</version>
+            <version>4.5.4-1.5.7-SNAPSHOT</version>
         </dependency>
     </dependencies>
     <build>

diff --git a/depthai/src/gen/java/org/bytedeco/depthai/BootloaderConfig.java b/depthai/src/gen/java/org/bytedeco/depthai/BootloaderConfig.java
@@ -0,0 +1,41 @@
+// Targeted by JavaCPP version 1.5.7-SNAPSHOT: DO NOT EDIT THIS FILE
+
+package org.bytedeco.depthai;
+
+import java.nio.*;
+import org.bytedeco.javacpp.*;
+import org.bytedeco.javacpp.annotation.*;
+
+import static org.bytedeco.javacpp.presets.javacpp.*;
+import static org.bytedeco.openblas.global.openblas_nolapack.*;
+import static org.bytedeco.openblas.global.openblas.*;
+import org.bytedeco.opencv.opencv_core.*;
+import static org.bytedeco.opencv.global.opencv_core.*;
+import org.bytedeco.opencv.opencv_imgproc.*;
+import static org.bytedeco.opencv.global.opencv_imgproc.*;
+
+import static org.bytedeco.depthai.global.depthai.*;
+
+
+@Name("dai::bootloader::Config") @Properties(inherit = org.bytedeco.depthai.presets.depthai.class)
+public class BootloaderConfig extends Pointer {
+    static { Loader.load(); }
+    /** Default native constructor. */
+    public BootloaderConfig() { super((Pointer)null); allocate(); }
+    /** Native array allocator. Access with {@link Pointer#position(long)}. */
+    public BootloaderConfig(long size) { super((Pointer)null); allocateArray(size); }
+    /** Pointer cast constructor. Invokes {@link Pointer#Pointer(Pointer)}. */
+    public BootloaderConfig(Pointer p) { super(p); }
+    private native void allocate();
+    private native void allocateArray(long size);
+    @Override public BootloaderConfig position(long position) {
+        return (BootloaderConfig)super.position(position);
+    }
+    @Override public BootloaderConfig getPointer(long i) {
+        return new BootloaderConfig((Pointer)this).offsetAddress(i);
+    }
+
+    public native @ByRef Memory appMem(); public native BootloaderConfig appMem(Memory setter);
+    public native @ByRef UsbConfig usb(); public native BootloaderConfig usb(UsbConfig setter);
+    public native @ByRef NetworkConfig network(); public native BootloaderConfig network(NetworkConfig setter);
+}
diff --git a/depthai/src/gen/java/org/bytedeco/depthai/CalibrationHandler.java b/depthai/src/gen/java/org/bytedeco/depthai/CalibrationHandler.java
@@ -198,9 +198,12 @@ public class CalibrationHandler extends Pointer {
      *  Get the Fov of the camera
      *
      * @param cameraId of the camera of which we are fetching fov.
+     * @param useSpec Disabling this bool will calculate the fov based on intrinsics (focal length, image width), instead of getting it from the camera specs
      * @return field of view of the camera with given cameraId.
      */
+    public native float getFov(CameraBoardSocket cameraId, @Cast("bool") boolean useSpec/*=true*/);
     public native float getFov(CameraBoardSocket cameraId);
+    public native float getFov(@Cast("dai::CameraBoardSocket") int cameraId, @Cast("bool") boolean useSpec/*=true*/);
     public native float getFov(@Cast("dai::CameraBoardSocket") int cameraId);
 
     /**
@@ -213,8 +216,8 @@ public class CalibrationHandler extends Pointer {
     public native @Cast("uint8_t") byte getLensPosition(@Cast("dai::CameraBoardSocket") int cameraId);
 
     /**
-     * Get the Camera Extrinsics object between two cameras from the data loaded if there is a linked connection
-     *  between any two cameras then there relative rotation and translation is returned by this function.
+     * Get the Camera Extrinsics object between two cameras from the calibration data if there is a linked connection
+     *  between any two cameras then the relative rotation and translation (in centimeters) is returned by this function.
      *
      * @param srcCamera Camera Id of the camera which will be considerd as origin.
      * @param dstCamera  Camera Id of the destination camera to which we are fetching the rotation and translation from the SrcCamera
@@ -235,6 +238,36 @@ public class CalibrationHandler extends Pointer {
     public native @ByVal FloatVectorVector getCameraExtrinsics(@Cast("dai::CameraBoardSocket") int srcCamera, @Cast("dai::CameraBoardSocket") int dstCamera, @Cast("bool") boolean useSpecTranslation/*=false*/);
     public native @ByVal FloatVectorVector getCameraExtrinsics(@Cast("dai::CameraBoardSocket") int srcCamera, @Cast("dai::CameraBoardSocket") int dstCamera);
 
+    /**
+     * Get the Camera translation vector between two cameras from the calibration data.
+     *
+     * @param srcCamera Camera Id of the camera which will be considerd as origin.
+     * @param dstCamera  Camera Id of the destination camera to which we are fetching the translation vector from the SrcCamera
+     * @param useSpecTranslation Disabling this bool uses the translation information from the calibration data (not the board design data)
+     * @return a translation vector like [x, y, z] in centimeters
+     */
+    public native @StdVector FloatPointer getCameraTranslationVector(CameraBoardSocket srcCamera, CameraBoardSocket dstCamera, @Cast("bool") boolean useSpecTranslation/*=true*/);
+    public native @StdVector FloatPointer getCameraTranslationVector(CameraBoardSocket srcCamera, CameraBoardSocket dstCamera);
+    public native @StdVector FloatBuffer getCameraTranslationVector(@Cast("dai::CameraBoardSocket") int srcCamera, @Cast("dai::CameraBoardSocket") int dstCamera, @Cast("bool") boolean useSpecTranslation/*=true*/);
+    public native @StdVector FloatBuffer getCameraTranslationVector(@Cast("dai::CameraBoardSocket") int srcCamera, @Cast("dai::CameraBoardSocket") int dstCamera);
+
+    /**
+     * Get the baseline distance between two specified cameras. By default it will get the baseline between CameraBoardSocket.RIGHT
+     * and CameraBoardSocket.LEFT.
+     *
+     * @param cam1 First camera
+     * @param cam2 Second camera
+     * @param useSpecTranslation Enabling this bool uses the translation information from the board design data (not the calibration data)
+     * @return baseline distance in centimeters
+     */
+    public native float getBaselineDistance(CameraBoardSocket cam1/*=dai::CameraBoardSocket::RIGHT*/,
+                                  CameraBoardSocket cam2/*=dai::CameraBoardSocket::LEFT*/,
+                                  @Cast("bool") boolean useSpecTranslation/*=true*/);
+    public native float getBaselineDistance();
+    public native float getBaselineDistance(@Cast("dai::CameraBoardSocket") int cam1/*=dai::CameraBoardSocket::RIGHT*/,
+                                  @Cast("dai::CameraBoardSocket") int cam2/*=dai::CameraBoardSocket::LEFT*/,
+                                  @Cast("bool") boolean useSpecTranslation/*=true*/);
+
     /**
      * Get the Camera To Imu Extrinsics object
      * From the data loaded if there is a linked connection between IMU and the given camera then there relative rotation and translation from the camera to IMU