Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv_contrib
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv_contrib
Commits
301aa7e9
Commit
301aa7e9
authored
Feb 08, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Plain Diff
Merge moved code from opencv
parents
d6895a1b
fa3603a5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
36 additions
and
14 deletions
+36
-14
perf_histogram.cpp
modules/cudaimgproc/perf/perf_histogram.cpp
+5
-3
clahe.cu
modules/cudaimgproc/src/cuda/clahe.cu
+0
-0
histogram.cpp
modules/cudaimgproc/src/histogram.cpp
+21
-8
test_histogram.cpp
modules/cudaimgproc/test/test_histogram.cpp
+10
-3
No files found.
modules/cudaimgproc/perf/perf_histogram.cpp
View file @
301aa7e9
...
...
@@ -183,16 +183,18 @@ PERF_TEST_P(Sz, EqualizeHist,
//////////////////////////////////////////////////////////////////////
// CLAHE
DEF_PARAM_TEST
(
Sz_ClipLimit
,
cv
::
Size
,
double
);
DEF_PARAM_TEST
(
Sz_ClipLimit
,
cv
::
Size
,
double
,
MatType
);
PERF_TEST_P
(
Sz_ClipLimit
,
CLAHE
,
Combine
(
CUDA_TYPICAL_MAT_SIZES
,
Values
(
0.0
,
40.0
)))
Values
(
0.0
,
40.0
),
Values
(
MatType
(
CV_8UC1
),
MatType
(
CV_16UC1
))))
{
const
cv
::
Size
size
=
GET_PARAM
(
0
);
const
double
clipLimit
=
GET_PARAM
(
1
);
const
int
type
=
GET_PARAM
(
2
);
cv
::
Mat
src
(
size
,
CV_8UC1
);
cv
::
Mat
src
(
size
,
type
);
declare
.
in
(
src
,
WARMUP_RNG
);
if
(
PERF_RUN_CUDA
())
...
...
modules/cudaimgproc/src/cuda/clahe.cu
View file @
301aa7e9
This diff is collapsed.
Click to expand it.
modules/cudaimgproc/src/histogram.cpp
View file @
301aa7e9
...
...
@@ -141,8 +141,9 @@ void cv::cuda::equalizeHist(InputArray _src, OutputArray _dst, Stream& _stream)
namespace
clahe
{
void
calcLut
(
PtrStepSzb
src
,
PtrStepb
lut
,
int
tilesX
,
int
tilesY
,
int2
tileSize
,
int
clipLimit
,
float
lutScale
,
cudaStream_t
stream
);
void
transform
(
PtrStepSzb
src
,
PtrStepSzb
dst
,
PtrStepb
lut
,
int
tilesX
,
int
tilesY
,
int2
tileSize
,
cudaStream_t
stream
);
void
calcLut_8U
(
PtrStepSzb
src
,
PtrStepb
lut
,
int
tilesX
,
int
tilesY
,
int2
tileSize
,
int
clipLimit
,
float
lutScale
,
cudaStream_t
stream
);
void
calcLut_16U
(
PtrStepSzus
src
,
PtrStepus
lut
,
int
tilesX
,
int
tilesY
,
int2
tileSize
,
int
clipLimit
,
float
lutScale
,
PtrStepSzi
hist
,
cudaStream_t
stream
);
template
<
typename
T
>
void
transform
(
PtrStepSz
<
T
>
src
,
PtrStepSz
<
T
>
dst
,
PtrStep
<
T
>
lut
,
int
tilesX
,
int
tilesY
,
int2
tileSize
,
cudaStream_t
stream
);
}
namespace
...
...
@@ -170,6 +171,7 @@ namespace
GpuMat
srcExt_
;
GpuMat
lut_
;
GpuMat
hist_
;
// histogram on global memory for CV_16UC1 case
};
CLAHE_Impl
::
CLAHE_Impl
(
double
clipLimit
,
int
tilesX
,
int
tilesY
)
:
...
...
@@ -186,14 +188,16 @@ namespace
{
GpuMat
src
=
_src
.
getGpuMat
();
CV_Assert
(
src
.
type
()
==
CV_8UC1
);
const
int
type
=
src
.
type
(
);
_dst
.
create
(
src
.
size
(),
src
.
type
()
);
CV_Assert
(
type
==
CV_8UC1
||
type
==
CV_16UC1
);
_dst
.
create
(
src
.
size
(),
type
);
GpuMat
dst
=
_dst
.
getGpuMat
();
const
int
histSize
=
25
6
;
const
int
histSize
=
type
==
CV_8UC1
?
256
:
6553
6
;
ensureSizeIsEnough
(
tilesX_
*
tilesY_
,
histSize
,
CV_8UC1
,
lut_
);
ensureSizeIsEnough
(
tilesX_
*
tilesY_
,
histSize
,
type
,
lut_
);
cudaStream_t
stream
=
StreamAccessor
::
getStream
(
s
);
...
...
@@ -227,9 +231,18 @@ namespace
clipLimit
=
std
::
max
(
clipLimit
,
1
);
}
clahe
::
calcLut
(
srcForLut
,
lut_
,
tilesX_
,
tilesY_
,
make_int2
(
tileSize
.
width
,
tileSize
.
height
),
clipLimit
,
lutScale
,
stream
);
if
(
type
==
CV_8UC1
)
clahe
::
calcLut_8U
(
srcForLut
,
lut_
,
tilesX_
,
tilesY_
,
make_int2
(
tileSize
.
width
,
tileSize
.
height
),
clipLimit
,
lutScale
,
stream
);
else
// type == CV_16UC1
{
ensureSizeIsEnough
(
tilesX_
*
tilesY_
,
histSize
,
CV_32SC1
,
hist_
);
clahe
::
calcLut_16U
(
srcForLut
,
lut_
,
tilesX_
,
tilesY_
,
make_int2
(
tileSize
.
width
,
tileSize
.
height
),
clipLimit
,
lutScale
,
hist_
,
stream
);
}
clahe
::
transform
(
src
,
dst
,
lut_
,
tilesX_
,
tilesY_
,
make_int2
(
tileSize
.
width
,
tileSize
.
height
),
stream
);
if
(
type
==
CV_8UC1
)
clahe
::
transform
<
uchar
>
(
src
,
dst
,
lut_
,
tilesX_
,
tilesY_
,
make_int2
(
tileSize
.
width
,
tileSize
.
height
),
stream
);
else
// type == CV_16UC1
clahe
::
transform
<
ushort
>
(
src
,
dst
,
lut_
,
tilesX_
,
tilesY_
,
make_int2
(
tileSize
.
width
,
tileSize
.
height
),
stream
);
}
void
CLAHE_Impl
::
setClipLimit
(
double
clipLimit
)
...
...
modules/cudaimgproc/test/test_histogram.cpp
View file @
301aa7e9
...
...
@@ -236,17 +236,19 @@ namespace
IMPLEMENT_PARAM_CLASS
(
ClipLimit
,
double
)
}
PARAM_TEST_CASE
(
CLAHE
,
cv
::
cuda
::
DeviceInfo
,
cv
::
Size
,
ClipLimit
)
PARAM_TEST_CASE
(
CLAHE
,
cv
::
cuda
::
DeviceInfo
,
cv
::
Size
,
ClipLimit
,
MatType
)
{
cv
::
cuda
::
DeviceInfo
devInfo
;
cv
::
Size
size
;
double
clipLimit
;
int
type
;
virtual
void
SetUp
()
{
devInfo
=
GET_PARAM
(
0
);
size
=
GET_PARAM
(
1
);
clipLimit
=
GET_PARAM
(
2
);
type
=
GET_PARAM
(
3
);
cv
::
cuda
::
setDevice
(
devInfo
.
deviceID
());
}
...
...
@@ -254,7 +256,11 @@ PARAM_TEST_CASE(CLAHE, cv::cuda::DeviceInfo, cv::Size, ClipLimit)
CUDA_TEST_P
(
CLAHE
,
Accuracy
)
{
cv
::
Mat
src
=
randomMat
(
size
,
CV_8UC1
);
cv
::
Mat
src
;
if
(
type
==
CV_8UC1
)
src
=
randomMat
(
size
,
type
);
else
if
(
type
==
CV_16UC1
)
src
=
randomMat
(
size
,
type
,
0
,
65535
);
cv
::
Ptr
<
cv
::
cuda
::
CLAHE
>
clahe
=
cv
::
cuda
::
createCLAHE
(
clipLimit
);
cv
::
cuda
::
GpuMat
dst
;
...
...
@@ -270,7 +276,8 @@ CUDA_TEST_P(CLAHE, Accuracy)
INSTANTIATE_TEST_CASE_P
(
CUDA_ImgProc
,
CLAHE
,
testing
::
Combine
(
ALL_DEVICES
,
DIFFERENT_SIZES
,
testing
::
Values
(
0.0
,
40.0
)));
testing
::
Values
(
0.0
,
5.0
,
10.0
,
20.0
,
40.0
),
testing
::
Values
(
MatType
(
CV_8UC1
),
MatType
(
CV_16UC1
))));
}}
// namespace
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment