From 05a93c28a226d32a8a0b49aa8df8a5d39728a404 Mon Sep 17 00:00:00 2001
From: Fabien Castan <fabcastan@gmail.com>
Date: Sun, 28 Jun 2020 15:58:26 +0200
Subject: [PATCH] [multiview] Add 2 new nodes to the HDRI pipeline:
 SfMTransform and ImageProcessing

---
 meshroom/multiview.py | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/meshroom/multiview.py b/meshroom/multiview.py
index f105f590..38ab59f0 100644
--- a/meshroom/multiview.py
+++ b/meshroom/multiview.py
@@ -146,8 +146,9 @@ def hdriPipeline(graph):
                                input=cameraInit.output)
 
     featureExtraction = graph.addNewNode('FeatureExtraction',
-                                         input=ldr2hdr.outSfMDataFilename)
-    featureExtraction.describerPreset.value = 'high'
+                                         input=ldr2hdr.outSfMDataFilename,
+                                         describerPreset='high')
+
     panoramaInit = graph.addNewNode('PanoramaInit',
                                      input=featureExtraction.input,
                                      dependency=[featureExtraction.output]  # Workaround for tractor submission with a fake dependency
@@ -157,6 +158,7 @@ def hdriPipeline(graph):
                                      input=panoramaInit.outSfMDataFilename,
                                      featuresFolders=[featureExtraction.output],
                                      method='FrustumOrVocabularyTree')
+
     featureMatching = graph.addNewNode('FeatureMatching',
                                        input=imageMatching.input,
                                        featuresFolders=imageMatching.featuresFolders,
@@ -167,11 +169,20 @@ def hdriPipeline(graph):
                                            featuresFolders=featureMatching.featuresFolders,
                                            matchesFolders=[featureMatching.output])
 
+    panoramaOrientation = graph.addNewNode('SfMTransform',
+                                           input=panoramaEstimation.output,
+                                           method='from_single_camera')
+
     panoramaWarping = graph.addNewNode('PanoramaWarping',
-                                        input=panoramaEstimation.output)
+                                       input=panoramaOrientation.output)
 
     panoramaCompositing = graph.addNewNode('PanoramaCompositing',
-                                        input=panoramaWarping.output)
+                                           input=panoramaWarping.output)
+
+    imageProcessing = graph.addNewNode('ImageProcessing',
+                                       input=panoramaCompositing.output,
+                                       fillHoles=True,
+                                       extension='exr')
 
     return [
         cameraInit,
@@ -180,8 +191,10 @@ def hdriPipeline(graph):
         imageMatching,
         featureMatching,
         panoramaEstimation,
+        panoramaOrientation,
         panoramaWarping,
         panoramaCompositing,
+        imageProcessing,
     ]