Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wangsen
paddle_dbnet
Commits
757d0160
Commit
757d0160
authored
May 11, 2021
by
WenmuZhou
Browse files
add det_use_polygon_score
parent
0f2d4027
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
52 additions
and
1 deletion
+52
-1
deploy/lite/config.txt
deploy/lite/config.txt
+1
-0
deploy/lite/db_post_process.cc
deploy/lite/db_post_process.cc
+51
-1
No files found.
deploy/lite/config.txt
View file @
757d0160
...
@@ -3,4 +3,5 @@ det_db_thresh 0.3
...
@@ -3,4 +3,5 @@ det_db_thresh 0.3
det_db_box_thresh 0.5
det_db_box_thresh 0.5
det_db_unclip_ratio 1.6
det_db_unclip_ratio 1.6
det_db_use_dilate 0
det_db_use_dilate 0
det_use_polygon_score 1
use_direction_classify 1
use_direction_classify 1
\ No newline at end of file
deploy/lite/db_post_process.cc
View file @
757d0160
...
@@ -190,6 +190,51 @@ float BoxScoreFast(std::vector<std::vector<float>> box_array, cv::Mat pred) {
...
@@ -190,6 +190,51 @@ float BoxScoreFast(std::vector<std::vector<float>> box_array, cv::Mat pred) {
return
score
;
return
score
;
}
}
float
PolygonScoreAcc
(
std
::
vector
<
cv
::
Point
>
contour
,
cv
::
Mat
pred
)
{
int
width
=
pred
.
cols
;
int
height
=
pred
.
rows
;
std
::
vector
<
float
>
box_x
;
std
::
vector
<
float
>
box_y
;
for
(
int
i
=
0
;
i
<
contour
.
size
();
++
i
)
{
box_x
.
push_back
(
contour
[
i
].
x
);
box_y
.
push_back
(
contour
[
i
].
y
);
}
int
xmin
=
clamp
(
int
(
std
::
floor
(
*
(
std
::
min_element
(
box_x
.
begin
(),
box_x
.
end
())))),
0
,
width
-
1
);
int
xmax
=
clamp
(
int
(
std
::
ceil
(
*
(
std
::
max_element
(
box_x
.
begin
(),
box_x
.
end
())))),
0
,
width
-
1
);
int
ymin
=
clamp
(
int
(
std
::
floor
(
*
(
std
::
min_element
(
box_y
.
begin
(),
box_y
.
end
())))),
0
,
height
-
1
);
int
ymax
=
clamp
(
int
(
std
::
ceil
(
*
(
std
::
max_element
(
box_y
.
begin
(),
box_y
.
end
())))),
0
,
height
-
1
);
cv
::
Mat
mask
;
mask
=
cv
::
Mat
::
zeros
(
ymax
-
ymin
+
1
,
xmax
-
xmin
+
1
,
CV_8UC1
);
cv
::
Point
*
rook_point
=
new
cv
::
Point
[
contour
.
size
()];
for
(
int
i
=
0
;
i
<
contour
.
size
();
++
i
)
{
rook_point
[
i
]
=
cv
::
Point
(
int
(
box_x
[
i
])
-
xmin
,
int
(
box_y
[
i
])
-
ymin
);
}
const
cv
::
Point
*
ppt
[
1
]
=
{
rook_point
};
int
npt
[]
=
{
int
(
contour
.
size
())};
cv
::
fillPoly
(
mask
,
ppt
,
npt
,
1
,
cv
::
Scalar
(
1
));
cv
::
Mat
croppedImg
;
pred
(
cv
::
Rect
(
xmin
,
ymin
,
xmax
-
xmin
+
1
,
ymax
-
ymin
+
1
))
.
copyTo
(
croppedImg
);
float
score
=
cv
::
mean
(
croppedImg
,
mask
)[
0
];
delete
[]
rook_point
;
return
score
;
}
std
::
vector
<
std
::
vector
<
std
::
vector
<
int
>>>
std
::
vector
<
std
::
vector
<
std
::
vector
<
int
>>>
BoxesFromBitmap
(
const
cv
::
Mat
pred
,
const
cv
::
Mat
bitmap
,
BoxesFromBitmap
(
const
cv
::
Mat
pred
,
const
cv
::
Mat
bitmap
,
std
::
map
<
std
::
string
,
double
>
Config
)
{
std
::
map
<
std
::
string
,
double
>
Config
)
{
...
@@ -197,6 +242,7 @@ BoxesFromBitmap(const cv::Mat pred, const cv::Mat bitmap,
...
@@ -197,6 +242,7 @@ BoxesFromBitmap(const cv::Mat pred, const cv::Mat bitmap,
const
int
max_candidates
=
1000
;
const
int
max_candidates
=
1000
;
const
float
box_thresh
=
static_cast
<
float
>
(
Config
[
"det_db_box_thresh"
]);
const
float
box_thresh
=
static_cast
<
float
>
(
Config
[
"det_db_box_thresh"
]);
const
float
unclip_ratio
=
static_cast
<
float
>
(
Config
[
"det_db_unclip_ratio"
]);
const
float
unclip_ratio
=
static_cast
<
float
>
(
Config
[
"det_db_unclip_ratio"
]);
const
int
det_use_polygon_score
=
int
(
Config
[
"det_use_polygon_score"
]);
int
width
=
bitmap
.
cols
;
int
width
=
bitmap
.
cols
;
int
height
=
bitmap
.
rows
;
int
height
=
bitmap
.
rows
;
...
@@ -228,7 +274,11 @@ BoxesFromBitmap(const cv::Mat pred, const cv::Mat bitmap,
...
@@ -228,7 +274,11 @@ BoxesFromBitmap(const cv::Mat pred, const cv::Mat bitmap,
}
}
float
score
;
float
score
;
score
=
BoxScoreFast
(
array
,
pred
);
if
(
det_use_polygon_score
)
{
score
=
PolygonScoreAcc
(
contours
[
i
],
pred
);
}
else
{
score
=
BoxScoreFast
(
array
,
pred
);
}
// end box_score_fast
// end box_score_fast
if
(
score
<
box_thresh
)
if
(
score
<
box_thresh
)
continue
;
continue
;
...
...
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