47426a8ae5
* goodFeaturesToTrack returns also corner value (cherry picked from commit 4a8f06755cf93785a82a455a2035a2ff572cafae) * Added response to GFTT Detector keypoints (cherry picked from commit b88fb40c6ea037e5283e4fbcf0ffde160c65a035) * Moved corner values to another optional variable to preserve backward compatibility (cherry picked from commit 6137383d32859efad7b44dd8a798e7b69f68dec5) * Removed corners valus from perf tests and better unit tests for corners values (cherry picked from commit f3d0ef21a78b7d0dc8696c457a6fabecfbe5e8ff) * Fixed detector gftt call (cherry picked from commit be2975553ba01a7d2e63f549fadccec6d7d56797) * Restored test_cornerEigenValsVecs (cherry picked from commit ea3e11811faee63487449983c0b80ff8ee35bbac) * scaling fixed; mineigen calculation rolled back; gftt function overload added (with quality parameter); perf tests were added for the new api function; external bindings were added for the function (with different alias); fixed issues with composition of the output array of the new function (e.g. as requested in comments) ; added sanity checks in the perf tests; removed C API changes. * minor change to GFTTDetector::detect * substitute ts->printf with EXPECT_LE * avoid re-allocations Co-authored-by: Anas <anas.el.amraoui@live.com> Co-authored-by: amir.tulegenov <amir.tulegenov@xperience.ai>
78 lines
2.9 KiB
C++
78 lines
2.9 KiB
C++
// This file is part of OpenCV project.
|
|
// It is subject to the license terms in the LICENSE file found in the top-level directory
|
|
// of this distribution and at http://opencv.org/license.html.
|
|
#include "perf_precomp.hpp"
|
|
|
|
namespace opencv_test {
|
|
|
|
typedef tuple<string, int, double, int, int, bool> Image_MaxCorners_QualityLevel_MinDistance_BlockSize_gradientSize_UseHarris_t;
|
|
typedef perf::TestBaseWithParam<Image_MaxCorners_QualityLevel_MinDistance_BlockSize_gradientSize_UseHarris_t> Image_MaxCorners_QualityLevel_MinDistance_BlockSize_gradientSize_UseHarris;
|
|
|
|
PERF_TEST_P(Image_MaxCorners_QualityLevel_MinDistance_BlockSize_gradientSize_UseHarris, goodFeaturesToTrack,
|
|
testing::Combine(
|
|
testing::Values( "stitching/a1.png", "cv/shared/pic5.png"),
|
|
testing::Values( 100, 500 ),
|
|
testing::Values( 0.1, 0.01 ),
|
|
testing::Values( 3, 5 ),
|
|
testing::Values( 3, 5 ),
|
|
testing::Bool()
|
|
)
|
|
)
|
|
{
|
|
string filename = getDataPath(get<0>(GetParam()));
|
|
int maxCorners = get<1>(GetParam());
|
|
double qualityLevel = get<2>(GetParam());
|
|
int blockSize = get<3>(GetParam());
|
|
int gradientSize = get<4>(GetParam());
|
|
bool useHarrisDetector = get<5>(GetParam());
|
|
|
|
Mat image = imread(filename, IMREAD_GRAYSCALE);
|
|
if (image.empty())
|
|
FAIL() << "Unable to load source image" << filename;
|
|
|
|
std::vector<Point2f> corners;
|
|
|
|
double minDistance = 1;
|
|
TEST_CYCLE() goodFeaturesToTrack(image, corners, maxCorners, qualityLevel, minDistance, noArray(), blockSize, gradientSize, useHarrisDetector);
|
|
|
|
if (corners.size() > 50)
|
|
corners.erase(corners.begin() + 50, corners.end());
|
|
|
|
SANITY_CHECK(corners);
|
|
}
|
|
|
|
PERF_TEST_P(Image_MaxCorners_QualityLevel_MinDistance_BlockSize_gradientSize_UseHarris, goodFeaturesToTrackWithQuality,
|
|
testing::Combine(
|
|
testing::Values( "stitching/a1.png", "cv/shared/pic5.png"),
|
|
testing::Values( 50 ),
|
|
testing::Values( 0.01 ),
|
|
testing::Values( 3 ),
|
|
testing::Values( 3 ),
|
|
testing::Bool()
|
|
)
|
|
)
|
|
{
|
|
string filename = getDataPath(get<0>(GetParam()));
|
|
int maxCorners = get<1>(GetParam());
|
|
double qualityLevel = get<2>(GetParam());
|
|
int blockSize = get<3>(GetParam());
|
|
int gradientSize = get<4>(GetParam());
|
|
bool useHarrisDetector = get<5>(GetParam());
|
|
double minDistance = 1;
|
|
|
|
Mat image = imread(filename, IMREAD_GRAYSCALE);
|
|
if (image.empty())
|
|
FAIL() << "Unable to load source image" << filename;
|
|
|
|
std::vector<Point2f> corners;
|
|
std::vector<float> cornersQuality;
|
|
|
|
TEST_CYCLE() goodFeaturesToTrack(image, corners, maxCorners, qualityLevel, minDistance, noArray(),
|
|
cornersQuality, blockSize, gradientSize, useHarrisDetector);
|
|
|
|
SANITY_CHECK(corners);
|
|
SANITY_CHECK(cornersQuality, 1e-6);
|
|
}
|
|
|
|
} // namespace
|