From 07a811ffdf70696f7ade47c291c98d951e16d4be Mon Sep 17 00:00:00 2001 From: alex-luxonis Date: Thu, 26 Jan 2023 00:14:12 +0200 Subject: [PATCH 1/5] FW: fix crash with ColorCamera at high resolution and certain ISP scaling --- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index aa07e9607..a4198c3a9 100644 --- a/cmake/Depthai/DepthaiDeviceSideConfig.cmake +++ b/cmake/Depthai/DepthaiDeviceSideConfig.cmake @@ -2,7 +2,7 @@ set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot") # "full commit hash of device side binary" -set(DEPTHAI_DEVICE_SIDE_COMMIT "f888710ca677ca662a4a83103e57c5a1ae2a5c7f") +set(DEPTHAI_DEVICE_SIDE_COMMIT "298d2545faae6763390a4320533e6b5d16c8b0f2") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "") From 7a3ac317d0f211cc33f8224de8da325b2b3bf55c Mon Sep 17 00:00:00 2001 From: TheMarpe Date: Thu, 26 Jan 2023 18:09:34 +0200 Subject: [PATCH 2/5] Bump version to 2.20.2 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1492a661e..158febfbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ if(WIN32) endif() # Create depthai project -project(depthai VERSION "2.20.1" LANGUAGES CXX C) +project(depthai VERSION "2.20.2" LANGUAGES CXX C) get_directory_property(has_parent PARENT_DIRECTORY) if(has_parent) set(DEPTHAI_VERSION ${PROJECT_VERSION} PARENT_SCOPE) From 1500889e483acb0e12642591f3483fac00adb261 Mon Sep 17 00:00:00 2001 From: TheMarpe Date: Thu, 26 Jan 2023 22:25:51 +0200 Subject: [PATCH 3/5] Added an ColorCamera isp scale example, and modified test workflow --- .github/workflows/test.workflow.yml | 4 +-- examples/CMakeLists.txt | 1 + examples/ColorCamera/rgb_isp_scale.cpp | 46 ++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 examples/ColorCamera/rgb_isp_scale.cpp diff --git a/.github/workflows/test.workflow.yml b/.github/workflows/test.workflow.yml index f135b2888..a9289b58a 100644 --- a/.github/workflows/test.workflow.yml +++ b/.github/workflows/test.workflow.yml @@ -57,7 +57,7 @@ jobs: cmake -S . -B build -D CMAKE_BUILD_TYPE=Release -D HUNTER_ROOT=$HOME/.hun2_${{ matrix.flavor }} -D DEPTHAI_BUILD_EXAMPLES=ON -D DEPTHAI_BUILD_TESTS=ON -D DEPTHAI_TEST_EXAMPLES=ON cmake --build build --parallel 4 --config Release cd build - ctest -C Release --output-on-failure -L usb --no-tests=error + ctest -C Release --output-on-failure -L usb --no-tests=error --repeat until-pass:3 - name: Configure, Build and Test if: matrix.os == 'linux' @@ -67,4 +67,4 @@ jobs: cmake -S . -B build -D CMAKE_BUILD_TYPE=Release -D HUNTER_ROOT=$HOME/.hun2_${{ matrix.flavor }} -D DEPTHAI_BUILD_EXAMPLES=ON -D DEPTHAI_BUILD_TESTS=ON -D DEPTHAI_TEST_EXAMPLES=ON cmake --build build --parallel 4 --config Release cd build - ctest -C Release --output-on-failure -L usb --no-tests=error + ctest -C Release --output-on-failure -L usb --no-tests=error --repeat until-pass:3 diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 2336863e0..8b90a8900 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -223,6 +223,7 @@ target_compile_definitions(calibration_load PRIVATE CALIB_PATH="${calib_v6}") dai_add_example(rgb_camera_control ColorCamera/rgb_camera_control.cpp ON) dai_add_example(rgb_preview ColorCamera/rgb_preview.cpp ON) dai_add_example(rgb_video ColorCamera/rgb_video.cpp ON) +dai_add_example(rgb_isp_scale ColorCamera/rgb_isp_scale.cpp ON) # EdgeDetector dai_add_example(edge_detector EdgeDetector/edge_detector.cpp ON) diff --git a/examples/ColorCamera/rgb_isp_scale.cpp b/examples/ColorCamera/rgb_isp_scale.cpp new file mode 100644 index 000000000..b0bc78343 --- /dev/null +++ b/examples/ColorCamera/rgb_isp_scale.cpp @@ -0,0 +1,46 @@ +#include + +// Includes common necessary includes for development using depthai library +#include "depthai/depthai.hpp" + +int main() { + // Create pipeline + dai::Pipeline pipeline; + + // Define source and output + auto camRgb = pipeline.create(); + auto xoutVideo = pipeline.create(); + + xoutVideo->setStreamName("video"); + + // Properties + camRgb->setBoardSocket(dai::CameraBoardSocket::RGB); + camRgb->setResolution(dai::ColorCameraProperties::SensorResolution::THE_4_K); + camRgb->setIspScale(1, 2); + camRgb->setVideoSize(1920, 1080); + + xoutVideo->input.setBlocking(false); + xoutVideo->input.setQueueSize(1); + + // Linking + camRgb->video.link(xoutVideo->input); + + // Connect to device and start pipeline + dai::Device device(pipeline); + + auto video = device.getOutputQueue("video"); + + while(true) { + auto videoIn = video->get(); + + // Get BGR frame from NV12 encoded video frame to show with opencv + // Visualizing the frame on slower hosts might have overhead + cv::imshow("video", videoIn->getCvFrame()); + + int key = cv::waitKey(1); + if(key == 'q' || key == 'Q') { + return 0; + } + } + return 0; +} From e73cf4cf5d06183cd291eac75f3693b0a330bfbf Mon Sep 17 00:00:00 2001 From: alex-luxonis Date: Fri, 27 Jan 2023 23:30:58 +0200 Subject: [PATCH 4/5] FW: fix OV9282 SW-sync on devices with OV9782 RGB camera --- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index a4198c3a9..5fea6138d 100644 --- a/cmake/Depthai/DepthaiDeviceSideConfig.cmake +++ b/cmake/Depthai/DepthaiDeviceSideConfig.cmake @@ -2,7 +2,7 @@ set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot") # "full commit hash of device side binary" -set(DEPTHAI_DEVICE_SIDE_COMMIT "298d2545faae6763390a4320533e6b5d16c8b0f2") +set(DEPTHAI_DEVICE_SIDE_COMMIT "d32f768aa9ea5e96db17c612f4a682738cea7748") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "") From 88af9a219eb8435090daf8dcbb8c72e2bb29e292 Mon Sep 17 00:00:00 2001 From: alex-luxonis Date: Tue, 31 Jan 2023 00:04:38 +0200 Subject: [PATCH 5/5] FW: fix for IMX378/477/577 on sockets other than RGB --- cmake/Depthai/DepthaiDeviceSideConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index 5fea6138d..b2897551c 100644 --- a/cmake/Depthai/DepthaiDeviceSideConfig.cmake +++ b/cmake/Depthai/DepthaiDeviceSideConfig.cmake @@ -2,7 +2,7 @@ set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot") # "full commit hash of device side binary" -set(DEPTHAI_DEVICE_SIDE_COMMIT "d32f768aa9ea5e96db17c612f4a682738cea7748") +set(DEPTHAI_DEVICE_SIDE_COMMIT "8c3d6ac1c77b0bf7f9ea6fd4d962af37663d2fbd") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "")