Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
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
Commits
e647b7c7
Commit
e647b7c7
authored
Feb 17, 2015
by
Erik Karlsson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Calculating almost_dist2weight at full size to avoid bounds checking
parent
baf266c2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
30 deletions
+20
-30
fast_nlmeans_denoising_invoker.hpp
modules/photo/src/fast_nlmeans_denoising_invoker.hpp
+10
-15
fast_nlmeans_multi_denoising_invoker.hpp
modules/photo/src/fast_nlmeans_multi_denoising_invoker.hpp
+10
-15
No files found.
modules/photo/src/fast_nlmeans_denoising_invoker.hpp
View file @
e647b7c7
...
...
@@ -128,22 +128,20 @@ FastNlMeansDenoisingInvoker<T, IT, UIT>::FastNlMeansDenoisingInvoker(
almost_template_window_size_sq_bin_shift_
=
getNearestPowerOf2
(
template_window_size_sq
);
double
almost_dist2actual_dist_multiplier
=
((
double
)(
1
<<
almost_template_window_size_sq_bin_shift_
))
/
template_window_size_sq
;
const
double
WEIGHT_THRESHOLD
=
0.001
;
const
size_t
ALLOC_CHUNK
=
65536
;
IT
max_dist
=
(
IT
)
pixelInfo
<
T
>::
sampleMax
()
*
(
IT
)
pixelInfo
<
T
>::
channels
;
size_t
almost_max_dist
=
0
;
while
(
true
)
size_t
almost_max_dist
=
(
size_t
)(
max_dist
/
almost_dist2actual_dist_multiplier
+
1
);
almost_dist2weight_
.
resize
(
almost_max_dist
);
const
double
WEIGHT_THRESHOLD
=
0.001
;
for
(
int
almost_dist
=
0
;
almost_dist
<
almost_max_dist
;
almost_dist
++
)
{
double
dist
=
almost_
max_
dist
*
almost_dist2actual_dist_multiplier
;
double
dist
=
almost_dist
*
almost_dist2actual_dist_multiplier
;
IT
weight
=
(
IT
)
round
(
fixed_point_mult_
*
std
::
exp
(
-
dist
*
dist
/
(
h
*
h
*
pixelInfo
<
T
>::
channels
)));
if
(
weight
<
WEIGHT_THRESHOLD
*
fixed_point_mult_
||
dist
>
max_dist
)
break
;
if
(
weight
<
WEIGHT_THRESHOLD
*
fixed_point_mult_
)
weight
=
0
;
if
(
almost_max_dist
>=
almost_dist2weight_
.
size
())
almost_dist2weight_
.
resize
(
almost_max_dist
+
ALLOC_CHUNK
);
almost_dist2weight_
[
almost_max_dist
++
]
=
weight
;
almost_dist2weight_
[
almost_dist
]
=
weight
;
}
almost_dist2weight_
.
resize
(
almost_max_dist
);
CV_Assert
(
almost_dist2weight_
[
0
]
==
fixed_point_mult_
);
// additional optimization init end
...
...
@@ -157,8 +155,6 @@ void FastNlMeansDenoisingInvoker<T, IT, UIT>::operator() (const Range& range) co
int
row_from
=
range
.
start
;
int
row_to
=
range
.
end
-
1
;
size_t
almost_max_dist
=
almost_dist2weight_
.
size
();
// sums of cols anf rows for current pixel p
Array2d
<
IT
>
dist_sums
(
search_window_size_
,
search_window_size_
);
...
...
@@ -242,8 +238,7 @@ void FastNlMeansDenoisingInvoker<T, IT, UIT>::operator() (const Range& range) co
for
(
int
x
=
0
;
x
<
search_window_size_
;
x
++
)
{
size_t
almostAvgDist
=
(
size_t
)(
dist_sums_row
[
x
]
>>
almost_template_window_size_sq_bin_shift_
);
IT
weight
=
almostAvgDist
<
almost_max_dist
?
almost_dist2weight_
[
almostAvgDist
]
:
0
;
IT
weight
=
almost_dist2weight_
[
almostAvgDist
];
weights_sum
+=
weight
;
T
p
=
cur_row_ptr
[
border_size_
+
search_window_x
+
x
];
...
...
modules/photo/src/fast_nlmeans_multi_denoising_invoker.hpp
View file @
e647b7c7
...
...
@@ -139,22 +139,20 @@ FastNlMeansMultiDenoisingInvoker<T, IT, UIT>::FastNlMeansMultiDenoisingInvoker(
int
almost_template_window_size_sq
=
1
<<
almost_template_window_size_sq_bin_shift
;
double
almost_dist2actual_dist_multiplier
=
(
double
)
almost_template_window_size_sq
/
template_window_size_sq
;
const
double
WEIGHT_THRESHOLD
=
0.001
;
const
size_t
ALLOC_CHUNK
=
65536
;
IT
max_dist
=
(
IT
)
pixelInfo
<
T
>::
sampleMax
()
*
(
IT
)
pixelInfo
<
T
>::
channels
;
size_t
almost_max_dist
=
0
;
while
(
true
)
int
almost_max_dist
=
(
int
)
(
max_dist
/
almost_dist2actual_dist_multiplier
+
1
);
almost_dist2weight
.
resize
(
almost_max_dist
);
const
double
WEIGHT_THRESHOLD
=
0.001
;
for
(
int
almost_dist
=
0
;
almost_dist
<
almost_max_dist
;
almost_dist
++
)
{
double
dist
=
almost_
max_
dist
*
almost_dist2actual_dist_multiplier
;
double
dist
=
almost_dist
*
almost_dist2actual_dist_multiplier
;
IT
weight
=
(
IT
)
round
(
fixed_point_mult_
*
std
::
exp
(
-
dist
*
dist
/
(
h
*
h
*
pixelInfo
<
T
>::
channels
)));
if
(
weight
<
WEIGHT_THRESHOLD
*
fixed_point_mult_
||
dist
>
max_dist
)
break
;
if
(
weight
<
WEIGHT_THRESHOLD
*
fixed_point_mult_
)
weight
=
0
;
if
(
almost_max_dist
>=
almost_dist2weight
.
size
())
almost_dist2weight
.
resize
(
almost_max_dist
+
ALLOC_CHUNK
);
almost_dist2weight
[
almost_max_dist
++
]
=
weight
;
almost_dist2weight
[
almost_dist
]
=
weight
;
}
almost_dist2weight
.
resize
(
almost_max_dist
);
CV_Assert
(
almost_dist2weight
[
0
]
==
fixed_point_mult_
);
// additional optimization init end
...
...
@@ -168,8 +166,6 @@ void FastNlMeansMultiDenoisingInvoker<T, IT, UIT>::operator() (const Range& rang
int
row_from
=
range
.
start
;
int
row_to
=
range
.
end
-
1
;
size_t
almost_max_dist
=
almost_dist2weight
.
size
();
Array3d
<
IT
>
dist_sums
(
temporal_window_size_
,
search_window_size_
,
search_window_size_
);
// for lazy calc optimization
...
...
@@ -270,8 +266,7 @@ void FastNlMeansMultiDenoisingInvoker<T, IT, UIT>::operator() (const Range& rang
{
size_t
almostAvgDist
=
(
size_t
)(
dist_sums_row
[
x
]
>>
almost_template_window_size_sq_bin_shift
);
IT
weight
=
almostAvgDist
<
almost_max_dist
?
almost_dist2weight
[
almostAvgDist
]
:
0
;
IT
weight
=
almost_dist2weight
[
almostAvgDist
];
weights_sum
+=
weight
;
T
p
=
cur_row_ptr
[
border_size_
+
search_window_x
+
x
];
...
...
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