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.

Sign up for GitHub

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

ImageManipV2 bugfixes #1212

Merged
merged 8 commits into from
Jan 23, 2025
Merged

ImageManipV2 bugfixes #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6059e1e
Fix ImageManipV2 rebuilding, 2B grayscale
asahtik Jan 15, 2025
f72f931
Merge branch 'v3_develop' of github.com:luxonis/depthai-core into ima…
asahtik Jan 15, 2025
51ec555
Merge branch 'v3_develop' of github.com:luxonis/depthai-core into ima…
asahtik Jan 17, 2025
7b293c9
Merge branch 'v3_develop' of github.com:luxonis/depthai-core into ima…
asahtik Jan 20, 2025
f31f433
Fix opencv crash when warping + converting a grayscale frame
asahtik Jan 21, 2025
a3d7880
Error out nicely if the source frame is one dimensional
asahtik Jan 22, 2025
3279822
Merge branch 'v3_develop' of github.com:luxonis/depthai-core into ima…
asahtik Jan 22, 2025
00de06b
RVC4 FW: ImageManipV2 bugfixes
asahtik Jan 22, 2025
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/DepthaiDeviceRVC4Config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ set(DEPTHAI_DEVICE_RVC4_MATURITY "snapshot")

# "version if applicable"
# set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+93f7b75a885aa32f44c5e9f53b74470c49d2b1af")
set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+a0274cd7dafa3622160fe0c7d1fccfc1937ec268")
set(DEPTHAI_DEVICE_RVC4_VERSION "0.0.1+09829e4939aeb5118b7d77fb6733ae614a5c485a")
14 changes: 9 additions & 5 deletions include/depthai/utility/ImageManipV2Impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2351,23 +2351,27 @@ template <template <typename T> typename ImageManipBuffer, typename ImageManipDa
ImageManipOperations<ImageManipBuffer, ImageManipData>& ImageManipOperations<ImageManipBuffer, ImageManipData>::build(
const ImageManipOpsBase<Container>& newBase, ImgFrame::Type outType, FrameSpecs srcFrameSpecs, ImgFrame::Type inFrameType) {
const auto newCfgStr = getConfigString(newBase);
if(outType == ImgFrame::Type::NONE) {
if(base.colormap != Colormap::NONE) outType = VALID_TYPE_COLOR;
else outType = inFrameType;
}
if(newCfgStr == prevConfig && outType == outputFrameType && srcFrameSpecs.width == srcSpecs.width && srcFrameSpecs.height == srcSpecs.height
&& inFrameType == inType)
return *this;
prevConfig = newCfgStr;
outputOps.clear();

if(srcFrameSpecs.width <= 1 || srcFrameSpecs.height <= 1) {
throw std::runtime_error("Input image is one dimensional");
}

if(newBase.hasWarp(srcFrameSpecs.width, srcFrameSpecs.height)) mode = mode | MODE_WARP;
if(newBase.colormap != Colormap::NONE && isSingleChannelu8(inFrameType)) mode = mode | MODE_COLORMAP;
if(outType != ImgFrame::Type::NONE && outType != inFrameType) mode = mode | MODE_CONVERT;
if(outType != inFrameType) mode = mode | MODE_CONVERT;

assert(inFrameType != ImgFrame::Type::NONE);
base = newBase;
outputFrameType = outType;
if(outType == ImgFrame::Type::NONE) {
if(base.colormap != Colormap::NONE) outputFrameType = VALID_TYPE_COLOR;
else outputFrameType = inFrameType;
}
inType = inFrameType;
type = inType;
srcSpecs = srcFrameSpecs;
Expand Down
1 change: 1 addition & 0 deletions src/utility/ImageManipV2Impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -988,6 +988,7 @@ size_t dai::impl::getAlignedOutputFrameSize(ImgFrame::Type type, size_t width, s
return ALIGN_UP(ALIGN_UP(width, 8) * height, PLANE_ALIGNMENT) + ALIGN_UP(width, 8) * (height / 2);
case ImgFrame::Type::RAW8:
case ImgFrame::Type::GRAY8:
return ALIGN_UP(width, 8) * height;
case ImgFrame::Type::YUV422i:
case ImgFrame::Type::YUV444p:
case ImgFrame::Type::YUV422p:
Expand Down
Loading