3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-07-23 03:27:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

[multiview] add DistortionCalibration node to the default camera tracking pipeline

Browse source
This commit is contained in:
Fabien Castan 2021-05-04 22:40:29 +02:00
parent c716bf39d6
commit 17f3ebc7d6
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
meshroom/multiview.py
View file

@ -490,6 +490,12 @@ def cameraTrackingPipeline(graph, sourceSfm=None):
sfmNodes, _ = sfmAugmentation(graph, sourceSfm) sfmNodes, _ = sfmAugmentation(graph, sourceSfm)
cameraInitT, featureExtractionT, imageMatchingT, featureMatchingT, structureFromMotionT = sfmNodes cameraInitT, featureExtractionT, imageMatchingT, featureMatchingT, structureFromMotionT = sfmNodes
distortionCalibrationT = graph.addNewNode('DistortionCalibration',
input=cameraInitT.output)
graph.removeEdge(structureFromMotionT.input)
graph.addEdge(distortionCalibrationT.outSfMData, structureFromMotionT.input)
imageMatchingT.attribute("nbMatches").value = 5 # voctree nb matches imageMatchingT.attribute("nbMatches").value = 5 # voctree nb matches
imageMatchingT.attribute("nbNeighbors").value = 10 imageMatchingT.attribute("nbNeighbors").value = 10
@ -509,6 +515,7 @@ def cameraTrackingPipeline(graph, sourceSfm=None):
featureExtractionT, featureExtractionT,
imageMatchingT, imageMatchingT,
featureMatchingT, featureMatchingT,
distortionCalibrationT,
structureFromMotionT, structureFromMotionT,
exportAnimatedCameraT, exportAnimatedCameraT,
] ]
@ -537,7 +544,7 @@ def photogrammetryAndCameraTracking(inputImages=list(), inputViewpoints=list(),
with GraphModification(graph): with GraphModification(graph):
cameraInit, featureExtraction, imageMatching, featureMatching, structureFromMotion = sfmPipeline(graph) cameraInit, featureExtraction, imageMatching, featureMatching, structureFromMotion = sfmPipeline(graph)
cameraInitT, featureExtractionT, imageMatchingMultiT, featureMatchingT, structureFromMotionT, exportAnimatedCameraT = cameraTrackingPipeline(graph, structureFromMotion) cameraInitT, featureExtractionT, imageMatchingMultiT, featureMatchingT, distortionCalibrationT, structureFromMotionT, exportAnimatedCameraT = cameraTrackingPipeline(graph, structureFromMotion)
cameraInit.viewpoints.extend([{'path': image} for image in inputImages]) cameraInit.viewpoints.extend([{'path': image} for image in inputImages])
cameraInit.viewpoints.extend(inputViewpoints) cameraInit.viewpoints.extend(inputViewpoints)