Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Added lut support for all new types in 5.x #25847

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

Merged
merged 1 commit into from
Jul 2, 2024
Merged

Added lut support for all new types in 5.x #25847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 19 additions & 1 deletion modules/core/src/lut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,26 @@ static void LUT8u_16s( const uchar* src, const short* lut, short* dst, int len,
LUT8u_( src, lut, dst, len, cn, lutcn );
}

static void LUT8u_32u( const uchar* src, const uint* lut, uint* dst, int len, int cn, int lutcn )
{
LUT8u_( src, lut, dst, len, cn, lutcn );
}

static void LUT8u_32s( const uchar* src, const int* lut, int* dst, int len, int cn, int lutcn )
{
LUT8u_( src, lut, dst, len, cn, lutcn );
}

static void LUT8u_64u( const uchar* src, const uint64_t* lut, uint64_t* dst, int len, int cn, int lutcn )
{
LUT8u_( src, lut, dst, len, cn, lutcn );
}

static void LUT8u_64s( const uchar* src, const int64_t* lut, int64_t* dst, int len, int cn, int lutcn )
{
LUT8u_( src, lut, dst, len, cn, lutcn );
}

static void LUT8u_16f( const uchar* src, const hfloat* lut, hfloat* dst, int len, int cn, int lutcn )
{
LUT8u_( src, lut, dst, len, cn, lutcn );
Expand All @@ -75,7 +90,10 @@ typedef void (*LUTFunc)( const uchar* src, const uchar* lut, uchar* dst, int len
static LUTFunc lutTab[CV_DEPTH_MAX] =
{
(LUTFunc)LUT8u_8u, (LUTFunc)LUT8u_8s, (LUTFunc)LUT8u_16u, (LUTFunc)LUT8u_16s,
(LUTFunc)LUT8u_32s, (LUTFunc)LUT8u_32f, (LUTFunc)LUT8u_64f, (LUTFunc)LUT8u_16f
(LUTFunc)LUT8u_32s, (LUTFunc)LUT8u_32f, (LUTFunc)LUT8u_64f, (LUTFunc)LUT8u_16f,
// new data types in 5.x
/*bf16*/ (LUTFunc)LUT8u_16f, /*bool*/(LUTFunc)LUT8u_8u, (LUTFunc)LUT8u_64u,
(LUTFunc)LUT8u_64s, (LUTFunc)LUT8u_32u
};

#ifdef HAVE_OPENCL
Expand Down
52 changes: 26 additions & 26 deletions modules/core/test/test_arithm.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3484,23 +3484,6 @@ INSTANTIATE_TEST_CASE_P(
testing::Values(CV_16BF, CV_Bool, CV_64U, CV_64S, CV_32U)
);

///////////////////////////////////////////////////////////////////////////////////
typedef testing::TestWithParam<perf::MatDepth> LutNotSupportedMatDepth;

TEST_P(LutNotSupportedMatDepth, lut)
{
cv::Mat src = cv::Mat::zeros(16,16, CV_8UC1);
cv::Mat lut = cv::Mat(1, 256, CV_MAKETYPE(GetParam(), 1));
cv::Mat dst;
EXPECT_THROW( cv::LUT(src,lut,dst), cv::Exception);
}

INSTANTIATE_TEST_CASE_P(
Lut,
LutNotSupportedMatDepth,
testing::Values(CV_16BF, CV_Bool, CV_64U, CV_64S, CV_32U)
);

///////////////////////////////////////////////////////////////////////////////////
typedef testing::TestWithParam<perf::MatDepth> MinMaxSupportedMatDepth;

Expand All @@ -3526,9 +3509,7 @@ INSTANTIATE_TEST_CASE_P(
testing::Values(perf::MatDepth(CV_16F), CV_16BF, CV_Bool, CV_64U, CV_64S, CV_32U)
);

CV_ENUM(LutMatType, CV_8U, CV_16U, CV_16F, CV_32S, CV_32F, CV_64F)

struct Core_LUT: public testing::TestWithParam<LutMatType>
struct Core_LUT: public testing::TestWithParam<perf::MatDepth>
{
template<typename T, int ch>
cv::Mat referenceWithType(cv::Mat input, cv::Mat table)
Expand Down Expand Up @@ -3559,21 +3540,25 @@ struct Core_LUT: public testing::TestWithParam<LutMatType>
template<int ch = 1>
cv::Mat reference(cv::Mat input, cv::Mat table)
{
if (table.type() == CV_8U)
if ((table.type() == CV_8U) || (table.type() == CV_8S) || (table.type() == CV_Bool))
{
return referenceWithType<uchar, ch>(input, table);
}
else if (table.type() == CV_16U)
else if ((table.type() == CV_16U) || (table.type() == CV_16S))
{
return referenceWithType<ushort, ch>(input, table);
}
else if (table.type() == CV_16F)
else if ((table.type() == CV_16F) || (table.type() == CV_16BF))
{
return referenceWithType<ushort, ch>(input, table);
}
else if (table.type() == CV_32S)
else if ((table.type() == CV_32S) || (table.type() == CV_32U))
{
return referenceWithType<int, ch>(input, table);
return referenceWithType<uint, ch>(input, table);
}
else if ((table.type() == CV_64S) || (table.type() == CV_64U))
{
return referenceWithType<uint64_t, ch>(input, table);
}
else if (table.type() == CV_32F)
{
Expand Down Expand Up @@ -3602,6 +3587,13 @@ TEST_P(Core_LUT, accuracy)

cv::Mat gt = reference(input, table);

// Force convert to 8U as CV_Bool is not supported in cv::norm for now
// TODO: Remove conversion after cv::norm fix
if (type == CV_Bool)
{
output.convertTo(output, CV_8U);
gt.convertTo(gt, CV_8U);
}
ASSERT_EQ(0, cv::norm(output, gt, cv::NORM_INF));
}

Expand All @@ -3619,10 +3611,18 @@ TEST_P(Core_LUT, accuracy_multi)

cv::Mat gt = reference<3>(input, table);

// Force convert to 8U as CV_Bool is not supported in cv::norm for now
// TODO: Remove conversion after cv::norm fix
if (type == CV_Bool)
{
output.convertTo(output, CV_8U);
gt.convertTo(gt, CV_8U);
}

ASSERT_EQ(0, cv::norm(output, gt, cv::NORM_INF));
}


INSTANTIATE_TEST_CASE_P(/**/, Core_LUT, LutMatType::all());
INSTANTIATE_TEST_CASE_P(/**/, Core_LUT, perf::MatDepth::all());

}} // namespace