Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gen1 updates: FrameMetadata all streams, sync seqNo, IMX477 RPi HQcam #16

Merged
merged 5 commits into from
Oct 17, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/Depthai/DepthaiDeviceSideConfig.cmake
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 "2f49dc5f43e668af0c70fe683367b390fc5a6abb")
set(DEPTHAI_DEVICE_SIDE_COMMIT "f9df8e9f3115e796682ff3499068b04f782f888f")

# "version if applicable"
set(DEPTHAI_DEVICE_SIDE_VERSION "")
6 changes: 3 additions & 3 deletions cmake/Hunter/config.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 2 additions & 0 deletions include/depthai/pipeline/host_pipeline_config.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion shared/depthai-shared
2 changes: 2 additions & 0 deletions src/device.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -920,6 +920,8 @@ std::shared_ptr<CNNHostPipeline> 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;
Expand Down
1 change: 1 addition & 0 deletions src/disparity_stream_post_processor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions src/pipeline/host_pipeline_config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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<bool>();
}

if (app_conf_obj.contains("sync_sequence_numbers"))
{
app_config.sync_sequence_numbers = app_conf_obj.at("sync_sequence_numbers").get<bool>();
}

if (app_conf_obj.contains("usb_chunk_KiB"))
{
app_config.usb_chunk_KiB = app_conf_obj.at("usb_chunk_KiB").get<uint32_t>();
}
}


Expand Down