-
Notifications
You must be signed in to change notification settings - Fork 193
Fix build when DEPTHAI_MERGED_TARGET is OFF #1896
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
Open
asahtik
wants to merge
8
commits into
develop
Choose a base branch
from
bugfix/non_merged_build
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
69ebc30
Fix build when DEPTHAI_MERGED_TARGET is off
asahtik 7baddc9
Fix linker and compiler errors
asahtik a74606a
Multiple definitions fix
asahtik 8104d69
More unmerged target issues fixed
asahtik 57a1ab8
Build fixes for various combinations of configuration options
asahtik e852dbc
clangformat
asahtik baad725
CMake fixes
asahtik fba0a9e
Move 32b check for dyncal
asahtik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,6 @@ | ||
| project(auto_calibration_examples) | ||
| cmake_minimum_required(VERSION 3.10) | ||
|
|
||
| dai_add_example(auto_calibration_example auto_calibration_example.cpp ON OFF) | ||
| if(DEPTHAI_MERGED_TARGET) | ||
| dai_add_example(auto_calibration_example auto_calibration_example.cpp ON OFF) | ||
| endif() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| #include "depthai/pipeline/node/Camera.hpp" | ||
|
|
||
| #include <stdexcept> | ||
|
|
||
| #include "depthai/pipeline/Pipeline.hpp" | ||
| #include "utility/RecordReplayImpl.hpp" | ||
|
|
||
| namespace dai::node { | ||
|
|
||
| std::shared_ptr<Camera> Camera::build(CameraBoardSocket boardSocket, ReplayVideo& replay) { | ||
| auto cam = build(boardSocket); | ||
| cam->setMockIsp(replay); | ||
| return cam; | ||
| } | ||
|
|
||
| std::shared_ptr<Camera> Camera::build(ReplayVideo& replay) { | ||
| auto cam = build(CameraBoardSocket::AUTO); | ||
| cam->setMockIsp(replay); | ||
| return cam; | ||
| } | ||
|
|
||
| Camera& Camera::setMockIsp(ReplayVideo& replay) { | ||
| if(replay.getReplayVideoFile().empty()) { | ||
| throw std::runtime_error("ReplayVideo video path not set"); | ||
| } | ||
|
|
||
| auto [width, height] = replay.getSize(); | ||
| double fps = replay.getFps(); | ||
| if(width <= 0 || height <= 0) { | ||
| const auto& [vidWidth, vidHeight, vidFps] = utility::getVideoSize(replay.getReplayVideoFile().string()); | ||
| width = vidWidth; | ||
| height = vidHeight; | ||
| fps = vidFps; | ||
| } | ||
| properties.mockIspWidth = width; | ||
| properties.mockIspHeight = height; | ||
| properties.mockIspFps = fps; | ||
|
|
||
| auto device = getParentPipeline().getDefaultDevice(); | ||
| replay.setOutFrameType(device && device->getPlatform() == Platform::RVC2 ? ImgFrame::Type::YUV420p : ImgFrame::Type::NV12); | ||
| replay.out.link(mockIsp); | ||
| return *this; | ||
| } | ||
|
|
||
| } // namespace dai::node |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| #include "depthai/pipeline/node/DetectionNetwork.hpp" | ||
|
|
||
| #include "utility/ErrorMacros.hpp" | ||
|
|
||
| namespace dai::node { | ||
|
|
||
| std::shared_ptr<DetectionNetwork> DetectionNetwork::build(const std::shared_ptr<ReplayVideo>& input, const Model& model, std::optional<float> fps) { | ||
| neuralNetwork->build(input, model, fps); | ||
| auto nnArchive = neuralNetwork->getNNArchive(); | ||
| DAI_CHECK(nnArchive.has_value(), "NeuralNetwork NNArchive is not set after build."); | ||
| detectionParser->setNNArchive(*nnArchive); | ||
| return std::static_pointer_cast<DetectionNetwork>(shared_from_this()); | ||
| } | ||
|
|
||
| } // namespace dai::node |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.