wip

Author: Fabien Servant

meshroom/aliceVision/ImageMatching.py

@@ -63,9 +63,10 @@ class ImageMatching(desc.AVCommandLineNode):
                         " - SequentialAndVocabularyTree:  Combines sequential approach with VocTree to enable connections between keyframes at different times.\n"
                         " - Exhaustive: Export all image pairs.\n"
                         " - Frustum: If images have known poses, computes the intersection between cameras frustums to create the list of image pairs.\n"
-                        " - FrustumOrVocabularyTree: If images have known poses, use frustum intersection else use VocabularyTree.\n",
+                        " - FrustumOrVocabularyTree: If images have known poses, use frustum intersection else use VocabularyTree.\n"
+                        " - Mirror: Try to match images with themselves. \n",
             value="SequentialAndVocabularyTree",
-            values=["VocabularyTree", "Sequential", "SequentialAndVocabularyTree", "Exhaustive", "Frustum", "FrustumOrVocabularyTree"],
+            values=["VocabularyTree", "Sequential", "SequentialAndVocabularyTree", "Exhaustive", "Frustum", "FrustumOrVocabularyTree", "Mirror"],
         ),
         desc.File(
             name="tree",

src/aliceVision/feature/feature.i

@@ -9,6 +9,15 @@
 %include <aliceVision/config.hpp>
 %include <aliceVision/global.i>
 
+namespace std
+{
+    #ifdef LINUXPLATFORM
+    typedef long unsigned int size_t;
+    #else
+    typedef long unsigned long size_t;
+    #endif
+}
+
 %{    
 #include <aliceVision/feature/Regions.hpp>
 #include <aliceVision/feature/imageDescriberCommon.hpp>

src/aliceVision/imageMatching/ImageMatching.cpp

@@ -40,6 +40,8 @@ std::string EImageMatchingMethod_enumToString(EImageMatchingMethod m)
             return "Frustum";
         case EImageMatchingMethod::FRUSTUM_OR_VOCABULARYTREE:
             return "FrustumOrVocabularyTree";
+        case EImageMatchingMethod::MIRROR:
+            return "Mirror";
     }
     throw std::out_of_range("Invalid EImageMatchingMethod enum: " + std::to_string(int(m)));
 }
@@ -61,6 +63,8 @@ EImageMatchingMethod EImageMatchingMethod_stringToEnum(const std::string& m)
         return EImageMatchingMethod::FRUSTUM;
     if (mode == "frustumorvocabularytree")
         return EImageMatchingMethod::FRUSTUM_OR_VOCABULARYTREE;
+    if (mode == "mirror")
+        return EImageMatchingMethod::MIRROR;
 
     throw std::out_of_range("Invalid EImageMatchingMethod: " + m);
 }
@@ -185,6 +189,14 @@ void generateSequentialMatches(const sfmData::SfMData& sfmData, size_t nbMatches
     }
 }
 
+void generateMirrorsMatches(const sfmData::SfMData& sfmData, OrderedPairList& outPairList)
+{
+    for (const auto& [index, _] : sfmData.getViews())
+    {
+        outPairList[index].insert(index);
+    }
+}
+
 void generateAllMatchesInOneMap(const std::set<IndexT>& viewIds, OrderedPairList& outPairList)
 {
     for (const IndexT imgA : viewIds)

src/aliceVision/imageMatching/ImageMatching.hpp

@@ -54,7 +54,8 @@ enum class EImageMatchingMethod
     SEQUENTIAL = 2,
     SEQUENTIAL_AND_VOCABULARYTREE = 3,
     FRUSTUM = 4,
-    FRUSTUM_OR_VOCABULARYTREE = 5
+    FRUSTUM_OR_VOCABULARYTREE = 5,
+    MIRROR = 6,
 };
 
 /**
@@ -116,6 +117,7 @@ EImageMatchingMode EImageMatchingMode_stringToEnum(const std::string& modeMultiS
 void convertAllMatchesToPairList(const PairList& allMatches, std::size_t numMatches, OrderedPairList& outPairList);
 
 void generateSequentialMatches(const sfmData::SfMData& sfmData, size_t nbMatches, OrderedPairList& outPairList);
+void generateMirrorsMatches(const sfmData::SfMData& sfmData, OrderedPairList& outPairList);
 void generateAllMatchesInOneMap(const std::set<IndexT>& viewIds, OrderedPairList& outPairList);
 void generateAllMatchesBetweenTwoMap(const std::set<IndexT>& viewIdsA, const std::set<IndexT>& viewIdsB, OrderedPairList& outPairList);
 

src/aliceVision/matchingImageCollection/ImagePairListIO.cpp

@@ -51,8 +51,8 @@ bool loadPairs(std::istream& stream, PairSet& pairs, int rangeStart, int rangeSi
             oss >> J;
             if (I == J)
             {
-                ALICEVISION_LOG_WARNING("loadPairs: Invalid input file. Image " << I << " sees itself.");
-                return false;
+                //ALICEVISION_LOG_WARNING("loadPairs: Invalid input file. Image " << I << " sees itself.");
+                //return false;
             }
             Pair pairToInsert;
 

src/software/pipeline/main_geometricFilterEstimating.cpp

@@ -123,7 +123,7 @@ int aliceVision_main(int argc, char** argv)
         ALICEVISION_LOG_ERROR("Unable to load matches.");
         return EXIT_FAILURE;
     }
-
+    
     int chunkStart, chunkEnd;
     if (!rangeComputation(chunkStart, chunkEnd, rangeIteration, rangeBlocksCount, pairwiseMatches.size()))
     {
@@ -172,7 +172,7 @@ int aliceVision_main(int argc, char** argv)
     ALICEVISION_LOG_INFO(std::to_string(filteredMatches.size()) << " putative image pair matches");
     for (const auto& imageMatch : filteredMatches)
     {
-        ALICEVISION_LOG_INFO("\t- image pair (" << imageMatch.first.first + ", " << imageMatch.first.second << ") contains " << imageMatch.second.getNbAllMatches() << " putative matches.");
+        ALICEVISION_LOG_INFO("\t- image pair (" << imageMatch.first.first << ", " << imageMatch.first.second << ") contains " << imageMatch.second.getNbAllMatches() << " putative matches.");
     }
 
 

src/software/pipeline/main_imageMatching.cpp

@@ -191,6 +191,16 @@ int aliceVision_main(int argc, char** argv)
 
     switch (method)
     {
+        case EImageMatchingMethod::MIRROR:
+            if (!useMultiSfM)
+            {
+                generateMirrorsMatches(sfmDataA, selectedPairs);
+            }
+            else 
+            {
+                ALICEVISION_THROW_ERROR("Invalid mirror mode for multisfm");
+            }
+            break;
         case EImageMatchingMethod::EXHAUSTIVE:
         {
             ALICEVISION_LOG_INFO("Use EXHAUSTIVE method.");