mirror of
https://github.com/opencv/opencv.git
synced 2024-12-02 07:39:57 +08:00
1ba7c728a6
[evolution] Stitching for OpenCV 4.0 * stitching: wrap Stitcher::create for bindings * provide method for consistent stitcher usage across languages * samples: add python stitching sample * port cpp stitching sample to python * stitching: consolidate Stitcher create methods * remove Stitcher::createDefault, it returns Stitcher, not Ptr<Stitcher> -> inconsistent API * deprecate cv::createStitcher and cv::createStitcherScans in favor of Stitcher::create * stitching: avoid anonymous enum in Stitcher * ORIG_RESOL should be double * add documentatiton * stitching: improve documentation in Stitcher * stitching: expose estimator in Stitcher * remove ABI hack * stitching: drop try_use_gpu flag * OCL will be used automatically through T-API in OCL-enable paths * CUDA won't be used unless user sets CUDA-enabled classes manually * stitching: drop FeaturesFinder * use Feature2D instead of FeaturesFinder * interoperability with features2d module * detach from dependency on xfeatures2d * features2d: fix compute and detect to work with UMat vectors * correctly pass UMats as UMats to allow OCL paths * support vector of UMats as output arg * stitching: use nearest interpolation for resizing masks * fix warnings
148 lines
4.6 KiB
C++
148 lines
4.6 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.
|
|
//
|
|
// Copyright (C) 2014, Itseez, Inc, all rights reserved.
|
|
|
|
#include "../perf_precomp.hpp"
|
|
#include "opencv2/ts/ocl_perf.hpp"
|
|
|
|
#ifdef HAVE_OPENCL
|
|
|
|
namespace opencv_test {
|
|
using namespace perf;
|
|
namespace ocl {
|
|
|
|
#define SURF_MATCH_CONFIDENCE 0.65f
|
|
#define ORB_MATCH_CONFIDENCE 0.3f
|
|
#define WORK_MEGAPIX 0.6
|
|
|
|
typedef TestBaseWithParam<string> stitch;
|
|
|
|
#ifdef HAVE_OPENCV_XFEATURES2D
|
|
#define TEST_DETECTORS testing::Values("surf", "orb", "akaze")
|
|
#else
|
|
#define TEST_DETECTORS testing::Values("orb", "akaze")
|
|
#endif
|
|
|
|
OCL_PERF_TEST_P(stitch, a123, TEST_DETECTORS)
|
|
{
|
|
UMat pano;
|
|
|
|
vector<Mat> _imgs;
|
|
_imgs.push_back( imread( getDataPath("stitching/a1.png") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/a2.png") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/a3.png") ) );
|
|
vector<UMat> imgs = ToUMat(_imgs);
|
|
|
|
Ptr<Feature2D> featuresFinder = getFeatureFinder(GetParam());
|
|
Ptr<detail::FeaturesMatcher> featuresMatcher = GetParam() == "orb"
|
|
? makePtr<detail::BestOf2NearestMatcher>(false, ORB_MATCH_CONFIDENCE)
|
|
: makePtr<detail::BestOf2NearestMatcher>(false, SURF_MATCH_CONFIDENCE);
|
|
|
|
declare.iterations(20);
|
|
|
|
while(next())
|
|
{
|
|
Ptr<Stitcher> stitcher = Stitcher::create();
|
|
stitcher->setFeaturesFinder(featuresFinder);
|
|
stitcher->setFeaturesMatcher(featuresMatcher);
|
|
stitcher->setWarper(makePtr<SphericalWarper>());
|
|
stitcher->setRegistrationResol(WORK_MEGAPIX);
|
|
|
|
startTimer();
|
|
stitcher->stitch(imgs, pano);
|
|
stopTimer();
|
|
}
|
|
|
|
EXPECT_NEAR(pano.size().width, 1182, 50);
|
|
EXPECT_NEAR(pano.size().height, 682, 30);
|
|
|
|
SANITY_CHECK_NOTHING();
|
|
}
|
|
|
|
OCL_PERF_TEST_P(stitch, b12, TEST_DETECTORS)
|
|
{
|
|
UMat pano;
|
|
|
|
vector<Mat> imgs;
|
|
imgs.push_back( imread( getDataPath("stitching/b1.png") ) );
|
|
imgs.push_back( imread( getDataPath("stitching/b2.png") ) );
|
|
|
|
Ptr<Feature2D> featuresFinder = getFeatureFinder(GetParam());
|
|
Ptr<detail::FeaturesMatcher> featuresMatcher = GetParam() == "orb"
|
|
? makePtr<detail::BestOf2NearestMatcher>(false, ORB_MATCH_CONFIDENCE)
|
|
: makePtr<detail::BestOf2NearestMatcher>(false, SURF_MATCH_CONFIDENCE);
|
|
|
|
declare.iterations(20);
|
|
|
|
while(next())
|
|
{
|
|
Ptr<Stitcher> stitcher = Stitcher::create();
|
|
stitcher->setFeaturesFinder(featuresFinder);
|
|
stitcher->setFeaturesMatcher(featuresMatcher);
|
|
stitcher->setWarper(makePtr<SphericalWarper>());
|
|
stitcher->setRegistrationResol(WORK_MEGAPIX);
|
|
|
|
startTimer();
|
|
stitcher->stitch(imgs, pano);
|
|
stopTimer();
|
|
}
|
|
|
|
EXPECT_NEAR(pano.size().width, 1124, GetParam() == "surf" ? 100 : 50);
|
|
EXPECT_NEAR(pano.size().height, 644, GetParam() == "surf" ? 60 : 30);
|
|
|
|
SANITY_CHECK_NOTHING();
|
|
}
|
|
|
|
OCL_PERF_TEST_P(stitch, boat, TEST_DETECTORS)
|
|
{
|
|
Size expected_dst_size(10789, 2663);
|
|
checkDeviceMaxMemoryAllocSize(expected_dst_size, CV_16SC3, 4);
|
|
|
|
#if defined(_WIN32) && !defined(_WIN64)
|
|
if (cv::ocl::useOpenCL())
|
|
throw ::perf::TestBase::PerfSkipTestException();
|
|
#endif
|
|
|
|
UMat pano;
|
|
|
|
vector<Mat> _imgs;
|
|
_imgs.push_back( imread( getDataPath("stitching/boat1.jpg") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/boat2.jpg") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/boat3.jpg") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/boat4.jpg") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/boat5.jpg") ) );
|
|
_imgs.push_back( imread( getDataPath("stitching/boat6.jpg") ) );
|
|
vector<UMat> imgs = ToUMat(_imgs);
|
|
|
|
Ptr<Feature2D> featuresFinder = getFeatureFinder(GetParam());
|
|
Ptr<detail::FeaturesMatcher> featuresMatcher = GetParam() == "orb"
|
|
? makePtr<detail::BestOf2NearestMatcher>(false, ORB_MATCH_CONFIDENCE)
|
|
: makePtr<detail::BestOf2NearestMatcher>(false, SURF_MATCH_CONFIDENCE);
|
|
|
|
declare.iterations(20);
|
|
|
|
while(next())
|
|
{
|
|
Ptr<Stitcher> stitcher = Stitcher::create();
|
|
stitcher->setFeaturesFinder(featuresFinder);
|
|
stitcher->setFeaturesMatcher(featuresMatcher);
|
|
stitcher->setWarper(makePtr<SphericalWarper>());
|
|
stitcher->setRegistrationResol(WORK_MEGAPIX);
|
|
|
|
startTimer();
|
|
stitcher->stitch(imgs, pano);
|
|
stopTimer();
|
|
}
|
|
|
|
EXPECT_NEAR(pano.size().width, expected_dst_size.width, 200);
|
|
EXPECT_NEAR(pano.size().height, expected_dst_size.height, 100);
|
|
|
|
SANITY_CHECK_NOTHING();
|
|
}
|
|
|
|
} } // namespace opencv_test::ocl
|
|
|
|
#endif // HAVE_OPENCL
|