3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-23 22:16:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

[multiview] Update the SfM pipeline & augmentation for multiple inputs

Browse source
This commit is contained in:
Grégoire De Lillo 2018-06-06 11:47:35 +02:00 • committed by Yann Lanthony
parent f4b3364275
commit b0d8cf208b
1 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

17
meshroom/multiview.py
View file

@ -81,16 +81,15 @@ def sfmPipeline(graph):
input=cameraInit.output) input=cameraInit.output)
imageMatching = graph.addNewNode('ImageMatching', imageMatching = graph.addNewNode('ImageMatching',
input=featureExtraction.input, input=featureExtraction.input,
featuresFolder=featureExtraction.output, featuresFolders=[featureExtraction.output])
)
featureMatching = graph.addNewNode('FeatureMatching', featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input, input=imageMatching.input,
featuresFolder=imageMatching.featuresFolder, featuresFolders=imageMatching.featuresFolders,
imagePairsList=imageMatching.output) imagePairsList=imageMatching.output)
structureFromMotion = graph.addNewNode('StructureFromMotion', structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input, input=featureMatching.input,
featuresFolder=featureMatching.featuresFolder, featuresFolders=featureMatching.featuresFolders,
matchesFolder=featureMatching.output) matchesFolders=[featureMatching.output])
return [ return [
cameraInit, cameraInit,
featureExtraction, featureExtraction,
@ -163,16 +162,16 @@ def sfmAugmentation(graph, sourceSfm, withMVS=False):
input=cameraInit.output) input=cameraInit.output)
imageMatchingMulti = graph.addNewNode('ImageMatchingMultiSfM', imageMatchingMulti = graph.addNewNode('ImageMatchingMultiSfM',
input=featureExtraction.input, input=featureExtraction.input,
featuresFolder=featureExtraction.output featuresFolders=[featureExtraction.output]
) )
featureMatching = graph.addNewNode('FeatureMatching', featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatchingMulti.outputCombinedSfM, input=imageMatchingMulti.outputCombinedSfM,
featuresFolder=imageMatchingMulti.featuresFolder, featuresFolders=imageMatchingMulti.featuresFolders,
imagePairsList=imageMatchingMulti.output) imagePairsList=imageMatchingMulti.output)
structureFromMotion = graph.addNewNode('StructureFromMotion', structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input, input=featureMatching.input,
featuresFolder=featureMatching.featuresFolder, featuresFolders=featureMatching.featuresFolders,
matchesFolder=featureMatching.output) matchesFolders=[featureMatching.output])
graph.addEdge(sourceSfm.output, imageMatchingMulti.inputB) graph.addEdge(sourceSfm.output, imageMatchingMulti.inputB)
sfmNodes = [ sfmNodes = [