Skip to content

Commit 4ff8608

Browse files
committed
Merge branch 'release_2.20.2' into main
2 parents fb87348 + 88af9a2 commit 4ff8608

File tree

5 files changed

+51
-4
lines changed

5 files changed

+51
-4
lines changed

.github/workflows/test.workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
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
5858
cmake --build build --parallel 4 --config Release
5959
cd build
60-
ctest -C Release --output-on-failure -L usb --no-tests=error
60+
ctest -C Release --output-on-failure -L usb --no-tests=error --repeat until-pass:3
6161
6262
- name: Configure, Build and Test
6363
if: matrix.os == 'linux'
@@ -67,4 +67,4 @@ jobs:
6767
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
6868
cmake --build build --parallel 4 --config Release
6969
cd build
70-
ctest -C Release --output-on-failure -L usb --no-tests=error
70+
ctest -C Release --output-on-failure -L usb --no-tests=error --repeat until-pass:3

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ if(WIN32)
4343
endif()
4444

4545
# Create depthai project
46-
project(depthai VERSION "2.20.1" LANGUAGES CXX C)
46+
project(depthai VERSION "2.20.2" LANGUAGES CXX C)
4747
get_directory_property(has_parent PARENT_DIRECTORY)
4848
if(has_parent)
4949
set(DEPTHAI_VERSION ${PROJECT_VERSION} PARENT_SCOPE)

cmake/Depthai/DepthaiDeviceSideConfig.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")
33

44
# "full commit hash of device side binary"
5-
set(DEPTHAI_DEVICE_SIDE_COMMIT "f888710ca677ca662a4a83103e57c5a1ae2a5c7f")
5+
set(DEPTHAI_DEVICE_SIDE_COMMIT "8c3d6ac1c77b0bf7f9ea6fd4d962af37663d2fbd")
66

77
# "version if applicable"
88
set(DEPTHAI_DEVICE_SIDE_VERSION "")

examples/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,7 @@ target_compile_definitions(calibration_load PRIVATE CALIB_PATH="${calib_v6}")
223223
dai_add_example(rgb_camera_control ColorCamera/rgb_camera_control.cpp ON)
224224
dai_add_example(rgb_preview ColorCamera/rgb_preview.cpp ON)
225225
dai_add_example(rgb_video ColorCamera/rgb_video.cpp ON)
226+
dai_add_example(rgb_isp_scale ColorCamera/rgb_isp_scale.cpp ON)
226227

227228
# EdgeDetector
228229
dai_add_example(edge_detector EdgeDetector/edge_detector.cpp ON)
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
#include <iostream>
2+
3+
// Includes common necessary includes for development using depthai library
4+
#include "depthai/depthai.hpp"
5+
6+
int main() {
7+
// Create pipeline
8+
dai::Pipeline pipeline;
9+
10+
// Define source and output
11+
auto camRgb = pipeline.create<dai::node::ColorCamera>();
12+
auto xoutVideo = pipeline.create<dai::node::XLinkOut>();
13+
14+
xoutVideo->setStreamName("video");
15+
16+
// Properties
17+
camRgb->setBoardSocket(dai::CameraBoardSocket::RGB);
18+
camRgb->setResolution(dai::ColorCameraProperties::SensorResolution::THE_4_K);
19+
camRgb->setIspScale(1, 2);
20+
camRgb->setVideoSize(1920, 1080);
21+
22+
xoutVideo->input.setBlocking(false);
23+
xoutVideo->input.setQueueSize(1);
24+
25+
// Linking
26+
camRgb->video.link(xoutVideo->input);
27+
28+
// Connect to device and start pipeline
29+
dai::Device device(pipeline);
30+
31+
auto video = device.getOutputQueue("video");
32+
33+
while(true) {
34+
auto videoIn = video->get<dai::ImgFrame>();
35+
36+
// Get BGR frame from NV12 encoded video frame to show with opencv
37+
// Visualizing the frame on slower hosts might have overhead
38+
cv::imshow("video", videoIn->getCvFrame());
39+
40+
int key = cv::waitKey(1);
41+
if(key == 'q' || key == 'Q') {
42+
return 0;
43+
}
44+
}
45+
return 0;
46+
}

0 commit comments

Comments
 (0)