mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-25 14:47:07 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #17163 from AsyaPronina:gcompound_kernel_gmatp_coop

Browse Source 
* Fixed cooperation of Compound kernel and GMatP type

* Added test for GCompound kernel + GMatP type cooperation
This commit is contained in:
Anastasiya(Asya) Pronina 2020-08-25 16:51:43 +03:00 committed by GitHub
parent 458bd1652d
commit 1192cbe4ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 107 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gapi/include/opencv2/gapi/gcompoundkernel.hpp
View File

@ -75,6 +75,16 @@ template<typename U> struct get_compound_in<cv::GOpaque<U>>
}
};
template<> struct get_compound_in<cv::GMatP>
{
static cv::GMatP get(GCompoundContext &ctx, int idx)
{
auto mat = cv::GMatP();
ctx.m_args[idx] = GArg(mat);
return mat;
}
};
template<typename, typename, typename>
struct GCompoundCallHelper;

6
modules/gapi/src/backends/common/gcompoundkernel.cpp
View File

@ -32,7 +32,11 @@ cv::detail::GCompoundContext::GCompoundContext(const cv::GArgs& in_args)
{
case GShape::GMAT : m_args[i] = GArg(GMat()); break;
case GShape::GSCALAR: m_args[i] = GArg(GScalar()); break;
case GShape::GARRAY :/* do nothing - as handled in a special way, see gcompoundkernel.hpp for details */; break;
case GShape::GARRAY :
case GShape::GOPAQUE:
// do nothing - as handled in a special way, see gcompoundkernel.hpp for details
// same applies to GMatP
break;
default: GAPI_Assert(false);
}
}

92
modules/gapi/test/common/gapi_compoundkernel_tests.cpp
View File

@ -227,6 +227,73 @@ namespace
}
};
G_TYPED_KERNEL(GToInterleaved, <GMat(GMatP)>, "org.opencv.test.to_interleaved")
{
static GMatDesc outMeta(GMatDesc in)
{
GAPI_Assert(in.planar == true);
GAPI_Assert(in.chan == 3);
return in.asInterleaved();
}
};
G_TYPED_KERNEL(GToPlanar, <GMatP(GMat)>, "org.opencv.test.to_planar")
{
static GMatDesc outMeta(GMatDesc in)
{
GAPI_Assert(in.planar == false);
GAPI_Assert(in.chan == 3);
return in.asPlanar();
}
};
GAPI_OCV_KERNEL(GToInterleavedImpl, GToInterleaved)
{
static void run(const cv::Mat& in, cv::Mat& out)
{
constexpr int inPlanesCount = 3;
int inPlaneHeight = in.rows / inPlanesCount;
std::vector<cv::Mat> inPlanes(inPlanesCount);
for (int i = 0; i < inPlanesCount; ++i)
{
int startRow = i * inPlaneHeight;
int endRow = startRow + inPlaneHeight;
inPlanes[i] = in.rowRange(startRow, endRow);
}
cv::merge(inPlanes, out);
}
};
GAPI_OCV_KERNEL(GToPlanarImpl, GToPlanar)
{
static void run(const cv::Mat& in, cv::Mat& out)
{
std::vector<cv::Mat> inPlanes;
cv::split(in, inPlanes);
cv::vconcat(inPlanes, out);
}
};
G_TYPED_KERNEL(GCompoundToInterleavedToPlanar, <GMatP(GMatP)>,
"org.opencv.test.compound_to_interleaved_to_planar")
{
static GMatDesc outMeta(GMatDesc in)
{
GAPI_Assert(in.planar == true);
GAPI_Assert(in.chan == 3);
return in;
}
};
GAPI_COMPOUND_KERNEL(GCompoundToInterleavedToPlanarImpl, GCompoundToInterleavedToPlanar)
{
static GMatP expand(cv::GMatP in)
{
return GToPlanar::on(GToInterleaved::on(in));
}
};
} // namespace
// FIXME avoid cv::combine that use custom and default kernels together
@ -496,5 +563,30 @@ TEST(GCompoundKernel, RightGArrayHandle)
EXPECT_EQ(0, cvtest::norm(out_mat, ref_mat, NORM_INF));
}
TEST(GCompoundKernel, ToInterleavedToPlanar)
{
cv::GMatP in;
cv::GMatP out = GCompoundToInterleavedToPlanar::on(in);
const auto pkg = cv::gapi::kernels<GCompoundToInterleavedToPlanarImpl,
GToInterleavedImpl,
GToPlanarImpl>();
cv::GComputation comp(cv::GIn(in), cv::GOut(out));
constexpr int numPlanes = 3;
cv::Mat in_mat(cv::Size(15, 15), CV_8UC1),
out_mat,
ref_mat;
cv::randu(in_mat, 0, 255);
ref_mat = in_mat;
comp.compile(cv::descr_of(in_mat).asPlanar(numPlanes), cv::compile_args(pkg))
(cv::gin(in_mat), cv::gout(out_mat));
EXPECT_EQ(0, cvtest::norm(out_mat, ref_mat, NORM_INF));
}
} // opencv_test