mirror of
https://github.com/opencv/opencv.git
synced 2024-12-15 18:09:11 +08:00
47426a8ae5
* goodFeaturesToTrack returns also corner value (cherry picked from commit4a8f06755c) * Added response to GFTT Detector keypoints (cherry picked from commitb88fb40c6e) * Moved corner values to another optional variable to preserve backward compatibility (cherry picked from commit6137383d32) * Removed corners valus from perf tests and better unit tests for corners values (cherry picked from commitf3d0ef21a7) * Fixed detector gftt call (cherry picked from commitbe2975553b) * Restored test_cornerEigenValsVecs (cherry picked from commitea3e11811f) * 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>
117 lines
4.7 KiB
C++
117 lines
4.7 KiB
C++
///////////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// IMPORTANT: READ BEFORE DOWNLOADING, COPYING, INSTALLING OR USING.
|
|
//
|
|
// By downloading, copying, installing or using the software you agree to this license.
|
|
// If you do not agree to this license, do not download, install,
|
|
// copy or use the software.
|
|
//
|
|
//
|
|
// License Agreement
|
|
// For Open Source Computer Vision Library
|
|
// Copyright (C) 2010-2012, Multicoreware, Inc., all rights reserved.
|
|
// Copyright (C) 2010-2012, Institute Of Software Chinese Academy Of Science, all rights reserved.
|
|
// Copyright (C) 2010-2012, Advanced Micro Devices, Inc., all rights reserved.
|
|
// Third party copyrights are property of their respective owners.
|
|
//
|
|
//
|
|
// Redistribution and use in source and binary forms, with or without modification,
|
|
// are permitted provided that the following conditions are met:
|
|
//
|
|
// * Redistribution's of source code must retain the above copyright notice,
|
|
// this list of conditions and the following disclaimer.
|
|
//
|
|
// * Redistribution's in binary form must reproduce the above copyright notice,
|
|
// this list of conditions and the following disclaimer in the documentation
|
|
// and/or other materials provided with the distribution.
|
|
//
|
|
// * The name of the copyright holders may not be used to endorse or promote products
|
|
// derived from this software without specific prior written permission.
|
|
//
|
|
// This software is provided by the copyright holders and contributors "as is" and
|
|
// any express or implied warranties, including, but not limited to, the implied
|
|
// warranties of merchantability and fitness for a particular purpose are disclaimed.
|
|
// In no event shall the Intel Corporation or contributors be liable for any direct,
|
|
// indirect, incidental, special, exemplary, or consequential damages
|
|
// (including, but not limited to, procurement of substitute goods or services;
|
|
// loss of use, data, or profits; or business interruption) however caused
|
|
// and on any theory of liability, whether in contract, strict liability,
|
|
// or tort (including negligence or otherwise) arising in any way out of
|
|
// the use of this software, even if advised of the possibility of such damage.
|
|
//
|
|
//M*/
|
|
|
|
#include "../perf_precomp.hpp"
|
|
#include "opencv2/ts/ocl_perf.hpp"
|
|
|
|
#include <sstream>
|
|
|
|
#ifdef HAVE_OPENCL
|
|
|
|
namespace opencv_test {
|
|
namespace ocl {
|
|
|
|
//////////////////////////// GoodFeaturesToTrack //////////////////////////
|
|
|
|
typedef tuple<String, double, bool> GoodFeaturesToTrackParams;
|
|
typedef TestBaseWithParam<GoodFeaturesToTrackParams> GoodFeaturesToTrackFixture;
|
|
|
|
OCL_PERF_TEST_P(GoodFeaturesToTrackFixture, GoodFeaturesToTrack,
|
|
::testing::Combine(OCL_PERF_ENUM(String("gpu/opticalflow/rubberwhale1.png")),
|
|
OCL_PERF_ENUM(0.0, 3.0), Bool()))
|
|
{
|
|
GoodFeaturesToTrackParams params = GetParam();
|
|
const String fileName = get<0>(params);
|
|
const double minDistance = get<1>(params), qualityLevel = 0.01;
|
|
const bool harrisDetector = get<2>(params);
|
|
const int maxCorners = 1000;
|
|
|
|
Mat img = imread(getDataPath(fileName), cv::IMREAD_GRAYSCALE);
|
|
ASSERT_FALSE(img.empty()) << "could not load " << fileName;
|
|
|
|
checkDeviceMaxMemoryAllocSize(img.size(), img.type());
|
|
|
|
UMat src(img.size(), img.type()), dst(1, maxCorners, CV_32FC2);
|
|
img.copyTo(src);
|
|
|
|
declare.in(src, WARMUP_READ).out(dst);
|
|
|
|
OCL_TEST_CYCLE() cv::goodFeaturesToTrack(src, dst, maxCorners, qualityLevel,
|
|
minDistance, noArray(), 3, 3, harrisDetector, 0.04);
|
|
|
|
SANITY_CHECK(dst);
|
|
}
|
|
|
|
OCL_PERF_TEST_P(GoodFeaturesToTrackFixture, GoodFeaturesToTrackWithQuality,
|
|
::testing::Combine(OCL_PERF_ENUM(String("gpu/opticalflow/rubberwhale1.png")),
|
|
OCL_PERF_ENUM(3.0), Bool()))
|
|
{
|
|
GoodFeaturesToTrackParams params = GetParam();
|
|
const String fileName = get<0>(params);
|
|
const double minDistance = get<1>(params), qualityLevel = 0.01;
|
|
const bool harrisDetector = get<2>(params);
|
|
const int maxCorners = 1000;
|
|
|
|
Mat img = imread(getDataPath(fileName), cv::IMREAD_GRAYSCALE);
|
|
ASSERT_FALSE(img.empty()) << "could not load " << fileName;
|
|
|
|
checkDeviceMaxMemoryAllocSize(img.size(), img.type());
|
|
|
|
UMat src(img.size(), img.type()), dst(1, maxCorners, CV_32FC2);
|
|
img.copyTo(src);
|
|
|
|
std::vector<float> cornersQuality;
|
|
|
|
declare.in(src, WARMUP_READ).out(dst);
|
|
|
|
OCL_TEST_CYCLE() cv::goodFeaturesToTrack(src, dst, maxCorners, qualityLevel, minDistance,
|
|
noArray(), cornersQuality, 3, 3, harrisDetector, 0.04);
|
|
|
|
SANITY_CHECK(dst);
|
|
SANITY_CHECK(cornersQuality, 1e-6);
|
|
}
|
|
|
|
} } // namespace opencv_test::ocl
|
|
|
|
#endif
|