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

Merge pull request #20525 from SamFC10:fix-prior-variances

Browse Source
This commit is contained in:
Alexander Alekhin 2021-08-13 10:06:55 +00:00
commit 9d3826c676
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/dnn/src/layers/detection_output_layer.cpp
View File

@ -456,7 +456,7 @@ public:
// Retrieve all prior bboxes // Retrieve all prior bboxes
std::vector<util::NormalizedBBox> priorBBoxes; std::vector<util::NormalizedBBox> priorBBoxes;
std::vector<std::vector<float> > priorVariances; std::vector<std::vector<float> > priorVariances;
GetPriorBBoxes(priorData, numPriors, _bboxesNormalized, priorBBoxes, priorVariances); GetPriorBBoxes(priorData, numPriors, _bboxesNormalized, _varianceEncodedInTarget, priorBBoxes, priorVariances);
// Decode all loc predictions to bboxes // Decode all loc predictions to bboxes
util::NormalizedBBox clipBounds; util::NormalizedBBox clipBounds;
@ -750,7 +750,7 @@ public:
CV_Assert(prior_bboxes.size() == prior_variances.size()); CV_Assert(prior_bboxes.size() == prior_variances.size());
CV_Assert(prior_bboxes.size() == bboxes.size()); CV_Assert(prior_bboxes.size() == bboxes.size());
size_t num_bboxes = prior_bboxes.size(); size_t num_bboxes = prior_bboxes.size();
CV_Assert(num_bboxes == 0 || prior_variances[0].size() == 4); CV_Assert(num_bboxes == 0 || prior_variances[0].size() == 4 || variance_encoded_in_target);
decode_bboxes.clear(); decode_bboxes.resize(num_bboxes); decode_bboxes.clear(); decode_bboxes.resize(num_bboxes);
if(variance_encoded_in_target) if(variance_encoded_in_target)
{ {
@ -802,12 +802,13 @@ public:
} }
// Get prior bounding boxes from prior_data // Get prior bounding boxes from prior_data
// prior_data: 1 x 2 x num_priors * 4 x 1 blob. // prior_data: 1 x 1 x num_priors * 4 x 1 blob or 1 x 2 x num_priors * 4 x 1 blob.
// num_priors: number of priors. // num_priors: number of priors.
// prior_bboxes: stores all the prior bboxes in the format of util::NormalizedBBox. // prior_bboxes: stores all the prior bboxes in the format of util::NormalizedBBox.
// prior_variances: stores all the variances needed by prior bboxes. // prior_variances: stores all the variances needed by prior bboxes.
static void GetPriorBBoxes(const float* priorData, const int& numPriors, static void GetPriorBBoxes(const float* priorData, const int& numPriors,
bool normalized_bbox, std::vector<util::NormalizedBBox>& priorBBoxes, bool normalized_bbox, bool variance_encoded_in_target,
std::vector<util::NormalizedBBox>& priorBBoxes,
std::vector<std::vector<float> >& priorVariances) std::vector<std::vector<float> >& priorVariances)
{ {
priorBBoxes.clear(); priorBBoxes.resize(numPriors); priorBBoxes.clear(); priorBBoxes.resize(numPriors);
@ -823,13 +824,16 @@ public:
bbox.set_size(BBoxSize(bbox, normalized_bbox)); bbox.set_size(BBoxSize(bbox, normalized_bbox));
} }
for (int i = 0; i < numPriors; ++i) if (!variance_encoded_in_target)
{ {
int startIdx = (numPriors + i) * 4; for (int i = 0; i < numPriors; ++i)
// not needed here: priorVariances[i].clear();
for (int j = 0; j < 4; ++j)
{ {
priorVariances[i].push_back(priorData[startIdx + j]); int startIdx = (numPriors + i) * 4;
// not needed here: priorVariances[i].clear();
for (int j = 0; j < 4; ++j)
{
priorVariances[i].push_back(priorData[startIdx + j]);
}
} }
} }
} }