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

[multiview] Add connections between params in default pipelines

Browse source
This commit is contained in:
Fabien Castan 2020-12-18 01:15:12 +01:00
parent ecf10a65f7
commit 3fe6c22bc2
1 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

26
meshroom/multiview.py
View file

@ -210,10 +210,12 @@ def panoramaHdrPipeline(graph):
ldr2hdrCalibration = graph.addNewNode('LdrToHdrCalibration', ldr2hdrCalibration = graph.addNewNode('LdrToHdrCalibration',
input=ldr2hdrSampling.input, input=ldr2hdrSampling.input,
userNbBrackets=ldr2hdrSampling.userNbBrackets,
samples=ldr2hdrSampling.output) samples=ldr2hdrSampling.output)
ldr2hdrMerge = graph.addNewNode('LdrToHdrMerge', ldr2hdrMerge = graph.addNewNode('LdrToHdrMerge',
input=ldr2hdrCalibration.input, input=ldr2hdrCalibration.input,
userNbBrackets=ldr2hdrCalibration.userNbBrackets,
response=ldr2hdrCalibration.response) response=ldr2hdrCalibration.response)
featureExtraction = graph.addNewNode('FeatureExtraction', featureExtraction = graph.addNewNode('FeatureExtraction',
@ -233,12 +235,14 @@ def panoramaHdrPipeline(graph):
featureMatching = graph.addNewNode('FeatureMatching', featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input, input=imageMatching.input,
featuresFolders=imageMatching.featuresFolders, featuresFolders=imageMatching.featuresFolders,
imagePairsList=imageMatching.output) imagePairsList=imageMatching.output,
describerTypes=featureExtraction.describerTypes)
panoramaEstimation = graph.addNewNode('PanoramaEstimation', panoramaEstimation = graph.addNewNode('PanoramaEstimation',
input=featureMatching.input, input=featureMatching.input,
featuresFolders=featureMatching.featuresFolders, featuresFolders=featureMatching.featuresFolders,
matchesFolders=[featureMatching.output]) matchesFolders=[featureMatching.output],
describerTypes=featureMatching.describerTypes)
panoramaOrientation = graph.addNewNode('SfMTransform', panoramaOrientation = graph.addNewNode('SfMTransform',
input=panoramaEstimation.output, input=panoramaEstimation.output,
@ -340,11 +344,13 @@ def sfmPipeline(graph):
featureMatching = graph.addNewNode('FeatureMatching', featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatching.input, input=imageMatching.input,
featuresFolders=imageMatching.featuresFolders, featuresFolders=imageMatching.featuresFolders,
imagePairsList=imageMatching.output) imagePairsList=imageMatching.output,
describerTypes=featureExtraction.describerTypes)
structureFromMotion = graph.addNewNode('StructureFromMotion', structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input, input=featureMatching.input,
featuresFolders=featureMatching.featuresFolders, featuresFolders=featureMatching.featuresFolders,
matchesFolders=[featureMatching.output]) matchesFolders=[featureMatching.output],
describerTypes=featureMatching.describerTypes)
return [ return [
cameraInit, cameraInit,
featureExtraction, featureExtraction,
@ -419,16 +425,18 @@ def sfmAugmentation(graph, sourceSfm, withMVS=False):
featureMatching = graph.addNewNode('FeatureMatching', featureMatching = graph.addNewNode('FeatureMatching',
input=imageMatchingMulti.outputCombinedSfM, input=imageMatchingMulti.outputCombinedSfM,
featuresFolders=imageMatchingMulti.featuresFolders, featuresFolders=imageMatchingMulti.featuresFolders,
imagePairsList=imageMatchingMulti.output) imagePairsList=imageMatchingMulti.output,
describerTypes=featureExtraction.describerTypes)
structureFromMotion = graph.addNewNode('StructureFromMotion', structureFromMotion = graph.addNewNode('StructureFromMotion',
input=featureMatching.input, input=featureMatching.input,
featuresFolders=featureMatching.featuresFolders, featuresFolders=featureMatching.featuresFolders,
matchesFolders=[featureMatching.output]) matchesFolders=[featureMatching.output],
describerTypes=featureMatching.describerTypes)
graph.addEdge(sourceSfm.output, imageMatchingMulti.inputB) graph.addEdge(sourceSfm.output, imageMatchingMulti.inputB)
sfmNodes = [ sfmNodes = [
cameraInit, cameraInit,
featureMatching, featureExtraction,
imageMatchingMulti, imageMatchingMulti,
featureMatching, featureMatching,
structureFromMotion structureFromMotion