diff --git a/cmake/Depthai/DepthaiDeviceSideConfig.cmake b/cmake/Depthai/DepthaiDeviceSideConfig.cmake index 158d28145..d3637033e 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 "2f49dc5f43e668af0c70fe683367b390fc5a6abb") +set(DEPTHAI_DEVICE_SIDE_COMMIT "f9df8e9f3115e796682ff3499068b04f782f888f") # "version if applicable" set(DEPTHAI_DEVICE_SIDE_VERSION "") diff --git a/cmake/Hunter/config.cmake b/cmake/Hunter/config.cmake index 2f36436e4..5a602a8c7 100644 --- a/cmake/Hunter/config.cmake +++ b/cmake/Hunter/config.cmake @@ -13,9 +13,9 @@ hunter_config( hunter_config( XLink - VERSION "luxonis-2020.2" - URL "https://github.com/luxonis/XLink/archive/3f8c17eef960d0a76fcb8f78581407d74dade2c7.tar.gz" - SHA1 "00494618711aa285282af1c9937e39f42e568680" + VERSION "luxonis-2020.2-fix_boot_multiple_512-0" + URL "https://github.com/luxonis/XLink/archive/17bf859bc95589b2ee616d2ec32e97a239ac3210.zip" + SHA1 "cfbfdde1cdd9eedb1941ddc91c7465f4abfd7235" CMAKE_ARGS CMAKE_POSITION_INDEPENDENT_CODE=ON ) diff --git a/include/depthai/pipeline/host_pipeline_config.hpp b/include/depthai/pipeline/host_pipeline_config.hpp index 9c579be57..5688a1d79 100644 --- a/include/depthai/pipeline/host_pipeline_config.hpp +++ b/include/depthai/pipeline/host_pipeline_config.hpp @@ -87,6 +87,8 @@ struct HostPipelineConfig struct AppConfig { bool sync_video_meta_streams = false; + bool sync_sequence_numbers = false; + uint32_t usb_chunk_KiB = 64; // Increase to improve throughput, 0 to disable chunking } app_config; bool initWithJSON(const nlohmann::json &json_obj); diff --git a/shared/depthai-shared b/shared/depthai-shared index d93dccc8f..81898ccd9 160000 --- a/shared/depthai-shared +++ b/shared/depthai-shared @@ -1 +1 @@ -Subproject commit d93dccc8f42ee717b6f701eaed0e4e27d81b8cb2 +Subproject commit 81898ccd9ef6059265b284ea705576424784ec32 diff --git a/src/device.cpp b/src/device.cpp index 52221d946..1f5c4a090 100644 --- a/src/device.cpp +++ b/src/device.cpp @@ -920,6 +920,8 @@ std::shared_ptr Device::create_pipeline( json_config_obj["ot"]["confidence_threshold"] = config.ot.confidence_threshold; json_config_obj["app"]["sync_video_meta_streams"] = config.app_config.sync_video_meta_streams; + json_config_obj["app"]["sync_sequence_numbers"] = config.app_config.sync_sequence_numbers; + json_config_obj["app"]["usb_chunk_KiB"] = config.app_config.usb_chunk_KiB; bool add_disparity_post_processing_color = false; bool temp_measurement = false; diff --git a/src/disparity_stream_post_processor.cpp b/src/disparity_stream_post_processor.cpp index 53f20fddb..c6e19175c 100644 --- a/src/disparity_stream_post_processor.cpp +++ b/src/disparity_stream_post_processor.cpp @@ -51,6 +51,7 @@ void DisparityStreamPostProcessor::prepareDepthColorAndNotifyObservers( FrameMetadata *m = (FrameMetadata *)(depth.data() + depth.size() - sizeof(FrameMetadata)); memcpy(m, disp_uc + data.size - sizeof(FrameMetadata), sizeof(FrameMetadata)); m->frameSize = 3 * (data.size - sizeof(FrameMetadata)); + m->spec.bytesPP = 3; StreamData depth_d; depth_d.packet_number = data.packet_number; diff --git a/src/pipeline/host_pipeline_config.cpp b/src/pipeline/host_pipeline_config.cpp index 4c8cab1bf..674885ca7 100644 --- a/src/pipeline/host_pipeline_config.cpp +++ b/src/pipeline/host_pipeline_config.cpp @@ -388,6 +388,16 @@ bool HostPipelineConfig::initWithJSON(const nlohmann::json &json_obj) { app_config.sync_video_meta_streams = app_conf_obj.at("sync_video_meta_streams").get(); } + + if (app_conf_obj.contains("sync_sequence_numbers")) + { + app_config.sync_sequence_numbers = app_conf_obj.at("sync_sequence_numbers").get(); + } + + if (app_conf_obj.contains("usb_chunk_KiB")) + { + app_config.usb_chunk_KiB = app_conf_obj.at("usb_chunk_KiB").get(); + } }