[panorama] new templatesdev/largePanoramaMemoryClean

2 files changed, 52 insertions, 56 deletions

diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg
index e05afcc1..849765a4 100644
--- a/meshroom/pipelines/panoramaFisheyeHdr.mg
+++ b/meshroom/pipelines/panoramaFisheyeHdr.mg
@@ -1,18 +1,18 @@
 {
     "header": {
         "nodesVersions": {
+            "PanoramaMerging": "1.0", 
             "PanoramaSeams": "2.0", 
             "FeatureMatching": "2.0", 
-            "ImageProcessing": "3.0", 
             "PanoramaCompositing": "2.0", 
             "LdrToHdrMerge": "4.0", 
-            "PanoramaEstimation": "1.0", 
-            "LdrToHdrCalibration": "3.0", 
             "LdrToHdrSampling": "4.0", 
+            "LdrToHdrCalibration": "3.0", 
+            "PanoramaEstimation": "1.0", 
             "PanoramaInit": "2.0", 
             "CameraInit": "8.0", 
             "SfMTransform": "3.0", 
-            "PanoramaMerging": "1.0", 
+            "PanoramaPostProcessing": "1.0", 
             "ImageMatching": "2.0", 
             "FeatureExtraction": "1.1", 
             "PanoramaPrepareImages": "1.1", 
@@ -37,19 +37,6 @@
                 0
             ]
         }, 
-        "ImageProcessing_1": {
-            "inputs": {
-                "extension": "exr", 
-                "fillHoles": true, 
-                "input": "{PanoramaMerging_1.outputPanorama}", 
-                "fixNonFinite": true
-            }, 
-            "nodeType": "ImageProcessing", 
-            "position": [
-                3000, 
-                0
-            ]
-        }, 
         "PanoramaWarping_1": {
             "inputs": {
                 "input": "{SfMTransform_1.output}"
@@ -113,14 +100,14 @@
                 0
             ]
         }, 
-        "PanoramaSeams_1": {
+        "PanoramaMerging_1": {
             "inputs": {
-                "input": "{PanoramaWarping_1.input}", 
-                "warpingFolder": "{PanoramaWarping_1.output}"
+                "compositingFolder": "{PanoramaCompositing_1.output}", 
+                "input": "{PanoramaCompositing_1.input}"
             }, 
-            "nodeType": "PanoramaSeams", 
+            "nodeType": "PanoramaMerging", 
             "position": [
-                2400, 
+                2800, 
                 0
             ]
         }, 
@@ -128,7 +115,7 @@
             "inputs": {
                 "warpingFolder": "{PanoramaSeams_1.warpingFolder}", 
                 "labels": "{PanoramaSeams_1.output}", 
-                "input": "{PanoramaSeams_1.input}"
+                "input": "{PanoramaSeams_1.outputSfm}"
             }, 
             "nodeType": "PanoramaCompositing", 
             "position": [
@@ -155,6 +142,17 @@
                 0
             ]
         }, 
+        "PanoramaPostProcessing_1": {
+            "inputs": {
+                "inputPanorama": "{PanoramaMerging_1.outputPanorama}", 
+                "fillHoles": true
+            }, 
+            "nodeType": "PanoramaPostProcessing", 
+            "position": [
+                3005, 
+                -19
+            ]
+        }, 
         "PanoramaPrepareImages_1": {
             "inputs": {
                 "input": "{CameraInit_1.output}"
@@ -176,14 +174,14 @@
                 0
             ]
         }, 
-        "PanoramaMerging_1": {
+        "PanoramaSeams_1": {
             "inputs": {
-                "compositingFolder": "{PanoramaCompositing_1.output}", 
-                "input": "{PanoramaCompositing_1.input}"
+                "input": "{PanoramaWarping_1.input}", 
+                "warpingFolder": "{PanoramaWarping_1.output}"
             }, 
-            "nodeType": "PanoramaMerging", 
+            "nodeType": "PanoramaSeams", 
             "position": [
-                2800, 
+                2400, 
                 0
             ]
         }, 
diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg
index 316b3b8d..0fa54250 100644
--- a/meshroom/pipelines/panoramaHdr.mg
+++ b/meshroom/pipelines/panoramaHdr.mg
@@ -1,18 +1,18 @@
 {
     "header": {
         "nodesVersions": {
+            "PanoramaMerging": "1.0", 
             "PanoramaSeams": "2.0", 
             "FeatureMatching": "2.0", 
-            "ImageProcessing": "3.0", 
             "PanoramaCompositing": "2.0", 
             "LdrToHdrMerge": "4.0", 
-            "PanoramaEstimation": "1.0", 
-            "LdrToHdrCalibration": "3.0", 
             "LdrToHdrSampling": "4.0", 
+            "LdrToHdrCalibration": "3.0", 
+            "PanoramaEstimation": "1.0", 
             "PanoramaInit": "2.0", 
             "CameraInit": "8.0", 
             "SfMTransform": "3.0", 
-            "PanoramaMerging": "1.0", 
+            "PanoramaPostProcessing": "1.0", 
             "ImageMatching": "2.0", 
             "FeatureExtraction": "1.1", 
             "PanoramaPrepareImages": "1.1", 
@@ -37,19 +37,6 @@
                 0
             ]
         }, 
-        "ImageProcessing_1": {
-            "inputs": {
-                "extension": "exr", 
-                "fillHoles": true, 
-                "input": "{PanoramaMerging_1.outputPanorama}", 
-                "fixNonFinite": true
-            }, 
-            "nodeType": "ImageProcessing", 
-            "position": [
-                3000, 
-                0
-            ]
-        }, 
         "PanoramaWarping_1": {
             "inputs": {
                 "input": "{SfMTransform_1.output}"
@@ -109,14 +96,14 @@
                 0
             ]
         }, 
-        "PanoramaSeams_1": {
+        "PanoramaMerging_1": {
             "inputs": {
-                "input": "{PanoramaWarping_1.input}", 
-                "warpingFolder": "{PanoramaWarping_1.output}"
+                "compositingFolder": "{PanoramaCompositing_1.output}", 
+                "input": "{PanoramaCompositing_1.input}"
             }, 
-            "nodeType": "PanoramaSeams", 
+            "nodeType": "PanoramaMerging", 
             "position": [
-                2400, 
+                2800, 
                 0
             ]
         }, 
@@ -124,7 +111,7 @@
             "inputs": {
                 "warpingFolder": "{PanoramaSeams_1.warpingFolder}", 
                 "labels": "{PanoramaSeams_1.output}", 
-                "input": "{PanoramaSeams_1.input}"
+                "input": "{PanoramaSeams_1.outputSfm}"
             }, 
             "nodeType": "PanoramaCompositing", 
             "position": [
@@ -151,6 +138,17 @@
                 0
             ]
         }, 
+        "PanoramaPostProcessing_1": {
+            "inputs": {
+                "inputPanorama": "{PanoramaMerging_1.outputPanorama}", 
+                "fillHoles": true
+            }, 
+            "nodeType": "PanoramaPostProcessing", 
+            "position": [
+                3007, 
+                0
+            ]
+        }, 
         "PanoramaPrepareImages_1": {
             "inputs": {
                 "input": "{CameraInit_1.output}"
@@ -172,14 +170,14 @@
                 0
             ]
         }, 
-        "PanoramaMerging_1": {
+        "PanoramaSeams_1": {
             "inputs": {
-                "compositingFolder": "{PanoramaCompositing_1.output}", 
-                "input": "{PanoramaCompositing_1.input}"
+                "input": "{PanoramaWarping_1.input}", 
+                "warpingFolder": "{PanoramaWarping_1.output}"
             }, 
-            "nodeType": "PanoramaMerging", 
+            "nodeType": "PanoramaSeams", 
             "position": [
-                2800, 
+                2400, 
                 0
             ]
         },