features2d(sift): move SIFT tests / headers / build fixes

modules/features2d/include/opencv2/features2d.hpp

@@ -244,6 +244,39 @@ typedef Feature2D DescriptorExtractor;
 //! @addtogroup features2d_main
 //! @{
 
+
+/** @brief Class for extracting keypoints and computing descriptors using the Scale Invariant Feature Transform
+(SIFT) algorithm by D. Lowe @cite Lowe04 .
+*/
+class CV_EXPORTS_W SIFT : public Feature2D
+{
+public:
+    /**
+    @param nfeatures The number of best features to retain. The features are ranked by their scores
+    (measured in SIFT algorithm as the local contrast)
+
+    @param nOctaveLayers The number of layers in each octave. 3 is the value used in D. Lowe paper. The
+    number of octaves is computed automatically from the image resolution.
+
+    @param contrastThreshold The contrast threshold used to filter out weak features in semi-uniform
+    (low-contrast) regions. The larger the threshold, the less features are produced by the detector.
+
+    @param edgeThreshold The threshold used to filter out edge-like features. Note that the its meaning
+    is different from the contrastThreshold, i.e. the larger the edgeThreshold, the less features are
+    filtered out (more features are retained).
+
+    @param sigma The sigma of the Gaussian applied to the input image at the octave \#0. If your image
+    is captured with a weak camera with soft lenses, you might want to reduce the number.
+    */
+    CV_WRAP static Ptr<SIFT> create(int nfeatures = 0, int nOctaveLayers = 3,
+        double contrastThreshold = 0.04, double edgeThreshold = 10,
+        double sigma = 1.6);
+};
+
+typedef SIFT SiftFeatureDetector;
+typedef SIFT SiftDescriptorExtractor;
+
+
 /** @brief Class implementing the BRISK keypoint detector and descriptor extractor, described in @cite LCS11 .
  */
 class CV_EXPORTS_W BRISK : public Feature2D

modules/features2d/misc/java/test/SIFTDescriptorExtractorTest.java

@@ -6,6 +6,7 @@ import org.opencv.core.MatOfKeyPoint;
 import org.opencv.core.Point;
 import org.opencv.core.Scalar;
 import org.opencv.core.KeyPoint;
+import org.opencv.features2d.SIFT;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
 import org.opencv.imgproc.Imgproc;
@@ -29,7 +30,7 @@ public class SIFTDescriptorExtractorTest extends OpenCVTestCase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        extractor = createClassInstance(XFEATURES2D+"SIFT", DEFAULT_FACTORY, null, null);
+        extractor = SIFT.create();
         keypoint = new KeyPoint(55.775577545166016f, 44.224422454833984f, 16, 9.754629f, 8617.863f, 1, -1);
         matSize = 100;
         truth = new Mat(1, 128, CvType.CV_32FC1) {

modules/features2d/perf/perf_sift.cpp

@@ -5,13 +5,15 @@
 
 namespace opencv_test { namespace {
 
-typedef perf::TestBaseWithParam<std::string> sift;
+typedef perf::TestBaseWithParam<std::string> SIFT_detect;
+typedef perf::TestBaseWithParam<std::string> SIFT_extract;
+typedef perf::TestBaseWithParam<std::string> SIFT_full;
 
 #define SIFT_IMAGES \
     "cv/detectors_descriptors_evaluation/images_datasets/leuven/img1.png",\
     "stitching/a3.png"
 
-PERF_TEST_P(sift, detect, testing::Values(SIFT_IMAGES))
+PERF_TEST_P_(SIFT_detect, SIFT)
 {
     string filename = getDataPath(GetParam());
     Mat frame = imread(filename, IMREAD_GRAYSCALE);
@@ -29,7 +31,7 @@ PERF_TEST_P(sift, detect, testing::Values(SIFT_IMAGES))
     SANITY_CHECK_NOTHING();
 }
 
-PERF_TEST_P(sift, extract, testing::Values(SIFT_IMAGES))
+PERF_TEST_P_(SIFT_extract, SIFT)
 {
     string filename = getDataPath(GetParam());
     Mat frame = imread(filename, IMREAD_GRAYSCALE);
@@ -50,7 +52,7 @@ PERF_TEST_P(sift, extract, testing::Values(SIFT_IMAGES))
     SANITY_CHECK_NOTHING();
 }
 
-PERF_TEST_P(sift, full, testing::Values(SIFT_IMAGES))
+PERF_TEST_P_(SIFT_full, SIFT)
 {
     string filename = getDataPath(GetParam());
     Mat frame = imread(filename, IMREAD_GRAYSCALE);
@@ -69,4 +71,15 @@ PERF_TEST_P(sift, full, testing::Values(SIFT_IMAGES))
     SANITY_CHECK_NOTHING();
 }
 
+
+INSTANTIATE_TEST_CASE_P(/*nothing*/, SIFT_detect,
+    testing::Values(SIFT_IMAGES)
+);
+INSTANTIATE_TEST_CASE_P(/*nothing*/, SIFT_extract,
+    testing::Values(SIFT_IMAGES)
+);
+INSTANTIATE_TEST_CASE_P(/*nothing*/, SIFT_full,
+    testing::Values(SIFT_IMAGES)
+);
+
 }} // namespace

modules/features2d/src/sift.cpp

@@ -355,7 +355,6 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius,
 
     k = 0;
 #if CV_AVX2
-    if( USE_AVX2 )
     {
         __m256 __nd360 = _mm256_set1_ps(n/360.f);
         __m256i __n = _mm256_set1_epi32(n);
@@ -402,7 +401,6 @@ static float calcOrientationHist( const Mat& img, Point pt, int radius,
 
     i = 0;
 #if CV_AVX2
-    if( USE_AVX2 )
     {
         __m256 __d_1_16 = _mm256_set1_ps(1.f/16.f);
         __m256 __d_4_16 = _mm256_set1_ps(4.f/16.f);
@@ -784,7 +782,6 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
 
     k = 0;
 #if CV_AVX2
-    if( USE_AVX2 )
     {
         int CV_DECL_ALIGNED(32) idx_buf[8];
         float CV_DECL_ALIGNED(32) rco_buf[64];
@@ -928,7 +925,6 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
     len = d*d*n;
     k = 0;
 #if CV_AVX2
-    if( USE_AVX2 )
     {
         float CV_DECL_ALIGNED(32) nrm2_buf[8];
         __m256 __nrm2 = _mm256_setzero_ps();
@@ -956,7 +952,6 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
 #if 0 //CV_AVX2
     // This code cannot be enabled because it sums nrm2 in a different order,
     // thus producing slightly different results
-    if( USE_AVX2 )
     {
         float CV_DECL_ALIGNED(32) nrm2_buf[8];
         __m256 __dst;
@@ -989,7 +984,6 @@ static void calcSIFTDescriptor( const Mat& img, Point2f ptf, float ori, float sc
 #if 1
     k = 0;
 #if CV_AVX2
-    if( USE_AVX2 )
     {
         __m256 __dst;
         __m256 __min = _mm256_setzero_ps();

modules/features2d/test/test_descriptors_invariance.cpp

@@ -167,6 +167,9 @@ TEST_P(DescriptorScaleInvariance, scale)
  * Descriptors's rotation invariance check
  */
 
+INSTANTIATE_TEST_CASE_P(SIFT, DescriptorRotationInvariance,
+                        Value(IMAGE_TSUKUBA, SIFT::create(), SIFT::create(), 0.98f));
+
 INSTANTIATE_TEST_CASE_P(BRISK, DescriptorRotationInvariance,
                         Value(IMAGE_TSUKUBA, BRISK::create(), BRISK::create(), 0.99f));
 
@@ -183,6 +186,10 @@ INSTANTIATE_TEST_CASE_P(AKAZE_DESCRIPTOR_KAZE, DescriptorRotationInvariance,
  * Descriptor's scale invariance check
  */
 
+// TODO: Expected: (descInliersRatio) >= (minInliersRatio), actual: 0.330378 vs 0.78
+INSTANTIATE_TEST_CASE_P(DISABLED_SIFT, DescriptorScaleInvariance,
+                        Value(IMAGE_BIKES, SIFT::create(), SIFT::create(), 0.78f));
+
 INSTANTIATE_TEST_CASE_P(AKAZE, DescriptorScaleInvariance,
                         Value(IMAGE_BIKES, AKAZE::create(), AKAZE::create(), 0.6f));
 

modules/features2d/test/test_descriptors_regression.cpp

@@ -342,6 +342,13 @@ private:
 *                                Tests registrations                                     *
 \****************************************************************************************/
 
+TEST( Features2d_DescriptorExtractor_SIFT, regression )
+{
+    CV_DescriptorExtractorTest<L1<float> > test( "descriptor-sift", 1.0f,
+                                                SIFT::create() );
+    test.safe_run();
+}
+
 TEST( Features2d_DescriptorExtractor_BRISK, regression )
 {
     CV_DescriptorExtractorTest<Hamming> test( "descriptor-brisk",
@@ -388,7 +395,7 @@ TEST( Features2d_DescriptorExtractor_AKAZE_DESCRIPTOR_KAZE, regression )
     test.safe_run();
 }
 
-TEST( Features2d_DescriptorExtractor, batch )
+TEST( Features2d_DescriptorExtractor, batch_ORB )
 {
     string path = string(cvtest::TS::ptr()->get_data_path() + "detectors_descriptors_evaluation/images_datasets/graf");
     vector<Mat> imgs, descriptors;
@@ -416,6 +423,35 @@ TEST( Features2d_DescriptorExtractor, batch )
     }
 }
 
+TEST( Features2d_DescriptorExtractor, batch_SIFT )
+{
+    string path = string(cvtest::TS::ptr()->get_data_path() + "detectors_descriptors_evaluation/images_datasets/graf");
+    vector<Mat> imgs, descriptors;
+    vector<vector<KeyPoint> > keypoints;
+    int i, n = 6;
+    Ptr<SIFT> sift = SIFT::create();
+
+    for( i = 0; i < n; i++ )
+    {
+        string imgname = format("%s/img%d.png", path.c_str(), i+1);
+        Mat img = imread(imgname, 0);
+        imgs.push_back(img);
+    }
+
+    sift->detect(imgs, keypoints);
+    sift->compute(imgs, keypoints, descriptors);
+
+    ASSERT_EQ((int)keypoints.size(), n);
+    ASSERT_EQ((int)descriptors.size(), n);
+
+    for( i = 0; i < n; i++ )
+    {
+        EXPECT_GT((int)keypoints[i].size(), 100);
+        EXPECT_GT(descriptors[i].rows, 100);
+    }
+}
+
+
 class DescriptorImage : public TestWithParam<std::string>
 {
 protected:

modules/features2d/test/test_detectors_invariance.cpp

@@ -220,6 +220,9 @@ TEST_P(DetectorScaleInvariance, scale)
  * Detector's rotation invariance check
  */
 
+INSTANTIATE_TEST_CASE_P(SIFT, DetectorRotationInvariance,
+                        Value(IMAGE_TSUKUBA, SIFT::create(), 0.45f, 0.70f));
+
 INSTANTIATE_TEST_CASE_P(BRISK, DetectorRotationInvariance,
                         Value(IMAGE_TSUKUBA, BRISK::create(), 0.45f, 0.76f));
 
@@ -236,6 +239,10 @@ INSTANTIATE_TEST_CASE_P(AKAZE_DESCRIPTOR_KAZE, DetectorRotationInvariance,
  * Detector's scale invariance check
  */
 
+// TODO: Expected: (keyPointMatchesRatio) >= (minKeyPointMatchesRatio), actual: 0.596752 vs 0.69
+INSTANTIATE_TEST_CASE_P(DISABLED_SIFT, DetectorScaleInvariance,
+                        Value(IMAGE_BIKES, SIFT::create(), 0.69f, 0.98f));
+
 INSTANTIATE_TEST_CASE_P(BRISK, DetectorScaleInvariance,
                         Value(IMAGE_BIKES, BRISK::create(), 0.08f, 0.49f));
 

modules/features2d/test/test_detectors_regression.cpp

@@ -245,6 +245,12 @@ void CV_FeatureDetectorTest::run( int /*start_from*/ )
 *                                Tests registrations                                     *
 \****************************************************************************************/
 
+TEST( Features2d_Detector_SIFT, regression )
+{
+    CV_FeatureDetectorTest test( "detector-sift", SIFT::create() );
+    test.safe_run();
+}
+
 TEST( Features2d_Detector_BRISK, regression )
 {
     CV_FeatureDetectorTest test( "detector-brisk", BRISK::create() );

modules/features2d/test/test_keypoints.cpp

@@ -177,4 +177,11 @@ TEST(Features2d_Detector_Keypoints_AKAZE, validation)
     test_mldb.safe_run();
 }
 
+TEST(Features2d_Detector_Keypoints_SIFT, validation)
+{
+    CV_FeatureDetectorKeypointsTest test(SIFT::create());
+    test.safe_run();
+}
+
+
 }} // namespace