Skip to content

Commit

Permalink
Merge pull request #140 from luxonis/develop
Browse files Browse the repository at this point in the history 
Release v2.4.0
  • Loading branch information
@SzabolcsGergely
SzabolcsGergely committed May 24, 2021
2 parents 9cfcfa7 + 925b805 commit 57efb71
Show file tree
Hide file tree
Showing 69 changed files with 3,286 additions and 1,647 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if(WIN32)
endif()

# Create depthai project
project(depthai VERSION "2.3.0" LANGUAGES CXX C)
project(depthai VERSION "2.4.0" LANGUAGES CXX C)
get_directory_property(has_parent PARENT_DIRECTORY)
if(has_parent)
set(DEPTHAI_VERSION ${PROJECT_VERSION} PARENT_SCOPE)
Expand Down
2 changes: 1 addition & 1 deletion cmake/Depthai/DepthaiDeviceSideConfig.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set(DEPTHAI_DEVICE_SIDE_MATURITY "snapshot")

# "full commit hash of device side binary"
set(DEPTHAI_DEVICE_SIDE_COMMIT "16652fb049b5a9b47e3098d94fb9cedc353f82e9")
set(DEPTHAI_DEVICE_SIDE_COMMIT "556a856e85570e0d874d19b305a0080a8f1f58bf")

# "version if applicable"
set(DEPTHAI_DEVICE_SIDE_VERSION "")
162 changes: 106 additions & 56 deletions examples/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,17 +56,6 @@ endmacro()

# Hunter test data download

## message(STATUS "Location of test1.data: ${test1_data}")

# Color camera preview output example
dai_add_example(camera_preview src/camera_preview_example.cpp)

# Color camera video output example
dai_add_example(camera_video src/camera_video_example.cpp)

# Mono camera video output example
dai_add_example(mono_camera src/mono_camera_example.cpp)

# NeuralNetwork node, mobilenet example
hunter_private_data(
URL "https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/network/mobilenet-ssd_openvino_2021.2_6shave.blob"
Expand All @@ -91,6 +80,14 @@ hunter_private_data(
LOCATION tiny_yolo_v4_blob
)

# NeuralNetwork node, mobilenet example, 5 shaves
hunter_private_data(
URL "https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/network/mobilenet-ssd_openvino_2021.2_5shave.blob"
SHA1 "d715f85e474609cf3f696d7a2e3750804ed6c726"
FILE "mobilenet-ssd_openvino_2021.2_5shave.blob"
LOCATION mobilenet_5shaves_blob
)

# NeuralNetwork node, mobilenet example, 8 shaves
hunter_private_data(
URL "https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/network/mobilenet-ssd_openvino_2021.2_8shave.blob"
Expand All @@ -99,80 +96,133 @@ hunter_private_data(
LOCATION mobilenet_8shaves_blob
)

dai_add_example(camera_mobilenet src/camera_mobilenet_example.cpp)
target_compile_definitions(camera_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")
# Video file with objects to detect
hunter_private_data(
URL "https://artifacts.luxonis.com/artifactory/luxonis-depthai-data-local/network/construction_vest.mp4"
SHA1 "271d8d0b702e683ce02957db7c100843de5ceaec"
FILE "construction_vest.mp4"
LOCATION construction_vest
)

# NeuralNetwork node, webcam input (from host)
dai_add_example(webcam_mobilenet src/webcam_mobilenet_example.cpp)
target_compile_definitions(webcam_mobilenet PRIVATE BLOB_PATH="${mobilenet_8shaves_blob}")
## message(STATUS "Location of test1.data: ${test1_data}")

# MJPEG encoding
dai_add_example(mjpeg_encoding src/mjpeg_encoding_example.cpp)
# RGB camera preview output example
dai_add_example(rgb_preview src/rgb_preview.cpp)

# h264 encoding
dai_add_example(h264_encoding src/h264_encoding_example.cpp)
# Mono camera preview output example
dai_add_example(mono_preview src/mono_preview.cpp)

# StereoDepth example
dai_add_example(stereo src/stereo_example.cpp)
# Depth preview output example
dai_add_example(depth_preview src/depth_preview.cpp)

# Image Manip node examples
dai_add_example(image_manip src/image_manip_example.cpp)
dai_add_example(image_manip_warp src/image_manip_warp_example.cpp)
# rgb encoding
dai_add_example(rgb_encoding src/rgb_encoding.cpp)

# Color Camera config example
dai_add_example(color_camera_control src/color_camera_control_example.cpp)
# rgb+mono encoding
dai_add_example(rgb_mono_encoding src/rgb_mono_encoding.cpp)

# System information example
dai_add_example(system_information src/system_information_example.cpp)
dai_add_example(rgb_full_resolution_saver src/rgb_full_resolution_saver.cpp)

# Device getQueueEvent example
dai_add_example(device_queue_event src/device_queue_event_example.cpp)
dai_add_example(mono_full_resolution_saver src/mono_full_resolution_saver.cpp)

# OpenCV support example
dai_add_example(opencv_support src/opencv_support_example.cpp)
dai_add_example(rgb_mobilenet src/rgb_mobilenet.cpp)
target_compile_definitions(rgb_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")

# RGB-depth alignment example
dai_add_example(rgb_depth_aligned src/rgb_depth_aligned_example.cpp)
dai_add_example(mono_mobilenet src/mono_mobilenet.cpp)
target_compile_definitions(mono_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")

# Device side decoding example for mobilenet-ssd
dai_add_example(mobilenet_device_side_decoding src/mobilenet_device_side_decoding_example.cpp)
target_compile_definitions(mobilenet_device_side_decoding PRIVATE BLOB_PATH="${mobilenet_blob}")
dai_add_example(mono_depth_mobilenetssd src/mono_depth_mobilenetssd.cpp)
target_compile_definitions(mono_depth_mobilenetssd PRIVATE BLOB_PATH="${mobilenet_blob}")

# Device side decoding example for mobilenet-ssd with 3d coordinates on RGB camera
dai_add_example(spatial_mobilenet src/spatial_mobilenet_example.cpp)
target_compile_definitions(spatial_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")
dai_add_example(rgb_encoding_mono_mobilenet src/rgb_encoding_mono_mobilenet.cpp)
target_compile_definitions(rgb_encoding_mono_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")

# Device side decoding example for mobilenet-ssd with 3d coordinates on right camera
dai_add_example(spatial_mobilenet_mono src/spatial_mobilenet_mono_example.cpp)
target_compile_definitions(spatial_mobilenet_mono PRIVATE BLOB_PATH="${mobilenet_blob}")
dai_add_example(rgb_encoding_mono_mobilenet_depth src/rgb_encoding_mono_mobilenet_depth.cpp)
target_compile_definitions(rgb_encoding_mono_mobilenet_depth PRIVATE BLOB_PATH="${mobilenet_blob}")

dai_add_example(encoding_max_limit src/encoding_max_limit.cpp)

# RGB Camera config example
dai_add_example(rgb_camera_control src/rgb_camera_control.cpp)

dai_add_example(mono_camera_control src/mono_camera_control.cpp)

dai_add_example(depth_crop_control src/depth_crop_control.cpp)

dai_add_example(rgb_mobilenet_4k src/rgb_mobilenet_4k.cpp)
target_compile_definitions(rgb_mobilenet_4k PRIVATE BLOB_PATH="${mobilenet_5shaves_blob}")

# Device getQueueEvent example
dai_add_example(device_queue_event src/device_queue_event.cpp)

dai_add_example(video_mobilenet src/video_mobilenet.cpp)
target_compile_definitions(video_mobilenet PRIVATE BLOB_PATH="${mobilenet_8shaves_blob}" VIDEO_PATH="${construction_vest}")

dai_add_example(rgb_encoding_mobilenet src/rgb_encoding_mobilenet.cpp)
target_compile_definitions(rgb_encoding_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")

# Image Manip node examples
dai_add_example(image_manip src/image_manip_example.cpp)

# Imagae manip node exapmle with warping
dai_add_example(rgb_rotate_warp src/rgb_rotate_warp.cpp)

# Device side decoding example for tiny-yolo-v3
dai_add_example(tiny_yolo_v3_device_side_decoding src/tiny_yolo_v3_device_side_decoding_example.cpp)
dai_add_example(tiny_yolo_v3_device_side_decoding src/tiny_yolo_v3_device_side_decoding.cpp)
target_compile_definitions(tiny_yolo_v3_device_side_decoding PRIVATE BLOB_PATH="${tiny_yolo_v3_blob}")

# Device side decoding example for tiny-yolo-v4
dai_add_example(tiny_yolo_v4_device_side_decoding src/tiny_yolo_v4_device_side_decoding_example.cpp)
dai_add_example(tiny_yolo_v4_device_side_decoding src/tiny_yolo_v4_device_side_decoding.cpp)
target_compile_definitions(tiny_yolo_v4_device_side_decoding PRIVATE BLOB_PATH="${tiny_yolo_v4_blob}")

# Sync example between NN and camera frames
dai_add_example(camera_mobilenet_sync src/camera_mobilenet_sync_example.cpp)
target_compile_definitions(camera_mobilenet_sync PRIVATE BLOB_PATH="${mobilenet_blob}")
# OpenCV support example
dai_add_example(opencv_support src/opencv_support.cpp)

# System information example
dai_add_example(system_information src/system_information.cpp)

dai_add_example(spatial_location_calculator src/spatial_location_calculator_example.cpp)
# Device side decoding example for mobilenet-ssd with 3d coordinates on RGB camera
dai_add_example(spatial_mobilenet src/spatial_mobilenet.cpp)
target_compile_definitions(spatial_mobilenet PRIVATE BLOB_PATH="${mobilenet_blob}")

# Device side decoding example for mobilenet-ssd with 3d coordinates on right camera
dai_add_example(spatial_mobilenet_mono src/spatial_mobilenet_mono.cpp)
target_compile_definitions(spatial_mobilenet_mono PRIVATE BLOB_PATH="${mobilenet_blob}")

# Device side decoding example for tiny-yolo-v3 with 3d coordinates on RGB camera
dai_add_example(spatial_tiny_yolo_v3 src/spatial_tiny_yolo_example.cpp)
dai_add_example(spatial_tiny_yolo_v3 src/spatial_tiny_yolo.cpp)
target_compile_definitions(spatial_tiny_yolo_v3 PRIVATE BLOB_PATH="${tiny_yolo_v3_blob}")

# Device side decoding example for tiny-yolo-v4 with 3d coordinates on RGB camera
dai_add_example(spatial_tiny_yolo_v4 src/spatial_tiny_yolo_example.cpp)
dai_add_example(spatial_tiny_yolo_v4 src/spatial_tiny_yolo.cpp)
target_compile_definitions(spatial_tiny_yolo_v4 PRIVATE BLOB_PATH="${tiny_yolo_v4_blob}")

dai_add_example(spatial_location_calculator src/spatial_location_calculator.cpp)

# RGB camera video output example
dai_add_example(rgb_video src/rgb_video.cpp)

# Object tracker example on mobilenet SSD output
dai_add_example(object_tracker_example src/object_tracker_example.cpp)
target_compile_definitions(object_tracker_example PRIVATE BLOB_PATH="${mobilenet_blob}")
dai_add_example(object_tracker src/object_tracker.cpp)
target_compile_definitions(object_tracker PRIVATE BLOB_PATH="${mobilenet_blob}")

# Spatial Object tracker example on mobilenet SSD output
dai_add_example(spatial_object_tracker_example src/spatial_object_tracker_example.cpp)
target_compile_definitions(spatial_object_tracker_example PRIVATE BLOB_PATH="${mobilenet_blob}")
dai_add_example(spatial_object_tracker src/spatial_object_tracker.cpp)
target_compile_definitions(spatial_object_tracker PRIVATE BLOB_PATH="${mobilenet_blob}")

# Stereo Depth example
dai_add_example(stereo_depth_video src/stereo_depth_video.cpp)

# NeuralNetwork node, webcam input (from host)
dai_add_example(webcam_mobilenet src/webcam_mobilenet_example.cpp)
target_compile_definitions(webcam_mobilenet PRIVATE BLOB_PATH="${mobilenet_8shaves_blob}")

# MJPEG encoding
dai_add_example(mjpeg_encoding src/mjpeg_encoding_example.cpp)

# RGB-depth alignment example
dai_add_example(rgb_depth_aligned src/rgb_depth_aligned.cpp)

# Sync example between NN and camera frames
dai_add_example(camera_mobilenet_sync src/camera_mobilenet_sync_example.cpp)
target_compile_definitions(camera_mobilenet_sync PRIVATE BLOB_PATH="${mobilenet_blob}")
131 changes: 0 additions & 131 deletions examples/src/camera_mobilenet_example.cpp
View file

This file was deleted.

Loading

0 comments on commit 57efb71

Please sign in to comment.