From be39d72a70ba289076ef98e1a9932106b194fd10 Mon Sep 17 00:00:00 2001 From: Fabien Servant Date: Fri, 3 Mar 2023 14:43:29 +0100 Subject: [PATCH] modify template to connect use tiling --- meshroom/pipelines/panoramaFisheyeHdr.mg | 338 ++++++++++++----------- meshroom/pipelines/panoramaHdr.mg | 319 ++++++++++----------- 2 files changed, 330 insertions(+), 327 deletions(-) diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg index 6514aa50329..291f2461594 100644 --- a/meshroom/pipelines/panoramaFisheyeHdr.mg +++ b/meshroom/pipelines/panoramaFisheyeHdr.mg @@ -1,247 +1,249 @@ { "header": { "nodesVersions": { - "PanoramaMerging": "1.0", - "PanoramaSeams": "2.0", - "FeatureMatching": "2.0", - "PanoramaCompositing": "2.0", - "LdrToHdrMerge": "4.0", - "LdrToHdrSampling": "4.0", - "LdrToHdrCalibration": "3.0", - "PanoramaEstimation": "1.0", - "PanoramaInit": "2.0", - "CameraInit": "9.0", - "SfMTransform": "3.0", - "PanoramaPostProcessing": "1.0", - "ImageMatching": "2.0", - "FeatureExtraction": "1.1", - "PanoramaPrepareImages": "1.1", + "LdrToHdrCalibration": "3.0", + "ImageMatching": "2.0", + "PanoramaCompositing": "2.0", + "PanoramaPrepareImages": "1.1", + "SfMTransform": "3.0", + "FeatureMatching": "2.0", + "LdrToHdrSampling": "4.0", + "FeatureExtraction": "1.1", + "LdrToHdrMerge": "4.0", + "PanoramaMerging": "1.0", + "PanoramaPostProcessing": "1.0", + "PanoramaEstimation": "1.0", "PanoramaWarping": "1.0", - "Publish": "1.2" - }, - "releaseVersion": "2021.1.0", - "fileVersion": "1.1", + "Publish": "1.2", + "CameraInit": "9.0", + "PanoramaInit": "2.0", + "PanoramaSeams": "2.0" + }, + "releaseVersion": "2021.1.0", + "fileVersion": "1.1", "template": true - }, + }, "graph": { "LdrToHdrMerge_1": { + "nodeType": "LdrToHdrMerge", + "position": [ + 800, + 0 + ], "inputs": { - "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", - "byPass": "{LdrToHdrCalibration_1.byPass}", - "input": "{LdrToHdrCalibration_1.input}", - "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", + "input": "{LdrToHdrCalibration_1.input}", "response": "{LdrToHdrCalibration_1.response}", + "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", + "byPass": "{LdrToHdrCalibration_1.byPass}", + "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", "workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}" - }, - "nodeType": "LdrToHdrMerge", + } + }, + "PanoramaWarping_1": { + "nodeType": "PanoramaWarping", "position": [ - 800, + 2200, 0 - ] - }, - "PanoramaWarping_1": { + ], "inputs": { "input": "{SfMTransform_1.output}" - }, - "nodeType": "PanoramaWarping", + } + }, + "LdrToHdrCalibration_1": { + "nodeType": "LdrToHdrCalibration", "position": [ - 2200, + 600, 0 - ] - }, - "LdrToHdrCalibration_1": { + ], "inputs": { - "samples": "{LdrToHdrSampling_1.output}", - "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", - "byPass": "{LdrToHdrSampling_1.byPass}", - "input": "{LdrToHdrSampling_1.input}", + "input": "{LdrToHdrSampling_1.input}", + "samples": "{LdrToHdrSampling_1.output}", "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}", - "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}", - "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}" - }, - "nodeType": "LdrToHdrCalibration", + "byPass": "{LdrToHdrSampling_1.byPass}", + "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}", + "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", + "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}" + } + }, + "LdrToHdrSampling_1": { + "nodeType": "LdrToHdrSampling", "position": [ - 600, + 400, 0 - ] - }, - "LdrToHdrSampling_1": { + ], "inputs": { "input": "{PanoramaPrepareImages_1.output}" - }, - "nodeType": "LdrToHdrSampling", + } + }, + "ImageMatching_1": { + "nodeType": "ImageMatching", "position": [ - 400, + 1400, 0 - ] - }, - "ImageMatching_1": { + ], "inputs": { - "input": "{PanoramaInit_1.outSfMData}", - "method": "FrustumOrVocabularyTree", + "input": "{PanoramaInit_1.outSfMData}", "featuresFolders": [ "{FeatureExtraction_1.output}" - ] - }, - "nodeType": "ImageMatching", + ], + "method": "FrustumOrVocabularyTree" + } + }, + "FeatureExtraction_1": { + "nodeType": "FeatureExtraction", "position": [ - 1400, + 1000, 0 - ] - }, - "FeatureExtraction_1": { + ], "inputs": { + "input": "{LdrToHdrMerge_1.outSfMData}", "describerTypes": [ "sift" - ], - "describerQuality": "high", - "input": "{LdrToHdrMerge_1.outSfMData}", - "describerPreset": "high" - }, - "nodeType": "FeatureExtraction", - "position": [ - 1000, - 0 - ] - }, + ], + "describerPreset": "high", + "describerQuality": "high" + } + }, "PanoramaMerging_1": { - "inputs": { - "compositingFolder": "{PanoramaCompositing_1.output}", - "input": "{PanoramaCompositing_1.input}" - }, - "nodeType": "PanoramaMerging", + "nodeType": "PanoramaMerging", "position": [ - 2800, + 2800, 0 - ] - }, - "PanoramaCompositing_1": { + ], "inputs": { - "warpingFolder": "{PanoramaSeams_1.warpingFolder}", - "labels": "{PanoramaSeams_1.output}", - "input": "{PanoramaSeams_1.outputSfm}" - }, - "nodeType": "PanoramaCompositing", + "input": "{PanoramaCompositing_1.input}", + "compositingFolder": "{PanoramaCompositing_1.output}", + "useTiling": "{PanoramaCompositing_1.useTiling}" + } + }, + "PanoramaCompositing_1": { + "nodeType": "PanoramaCompositing", "position": [ - 2600, + 2600, 0 - ] - }, + ], + "inputs": { + "input": "{PanoramaSeams_1.outputSfm}", + "warpingFolder": "{PanoramaSeams_1.warpingFolder}", + "labels": "{PanoramaSeams_1.output}", + "useTiling": false + } + }, "CameraInit_1": { + "nodeType": "CameraInit", + "position": [ + 0, + 0 + ], "inputs": { "allowedCameraModels": [ - "pinhole", - "radial1", - "radial3", - "brown", - "fisheye1", - "3deanamorphic4", - "3deradial4", + "pinhole", + "radial1", + "radial3", + "brown", + "fisheye1", + "3deanamorphic4", + "3deradial4", "3declassicld" ] - }, - "nodeType": "CameraInit", - "position": [ - 0, - 0 - ] - }, + } + }, "PanoramaPostProcessing_1": { - "inputs": { - "inputPanorama": "{PanoramaMerging_1.outputPanorama}", - "fillHoles": true - }, - "nodeType": "PanoramaPostProcessing", + "nodeType": "PanoramaPostProcessing", "position": [ - 3005, + 3005, -19 - ] - }, + ], + "inputs": { + "inputPanorama": "{PanoramaMerging_1.outputPanorama}", + "fillHoles": true + } + }, "PanoramaPrepareImages_1": { + "nodeType": "PanoramaPrepareImages", + "position": [ + 200, + 0 + ], "inputs": { "input": "{CameraInit_1.output}" - }, - "nodeType": "PanoramaPrepareImages", + } + }, + "SfMTransform_1": { + "nodeType": "SfMTransform", "position": [ - 200, + 2000, 0 - ] - }, - "SfMTransform_1": { + ], "inputs": { - "method": "manual", - "input": "{PanoramaEstimation_1.output}" - }, - "nodeType": "SfMTransform", + "input": "{PanoramaEstimation_1.output}", + "method": "manual" + } + }, + "PanoramaSeams_1": { + "nodeType": "PanoramaSeams", "position": [ - 2000, + 2400, 0 - ] - }, - "PanoramaSeams_1": { + ], "inputs": { - "input": "{PanoramaWarping_1.input}", + "input": "{PanoramaWarping_1.input}", "warpingFolder": "{PanoramaWarping_1.output}" - }, - "nodeType": "PanoramaSeams", + } + }, + "PanoramaEstimation_1": { + "nodeType": "PanoramaEstimation", "position": [ - 2400, + 1800, 0 - ] - }, - "PanoramaEstimation_1": { + ], "inputs": { + "input": "{FeatureMatching_1.input}", + "featuresFolders": "{FeatureMatching_1.featuresFolders}", "matchesFolders": [ "{FeatureMatching_1.output}" - ], - "input": "{FeatureMatching_1.input}", - "describerTypes": "{FeatureMatching_1.describerTypes}", - "featuresFolders": "{FeatureMatching_1.featuresFolders}" - }, - "nodeType": "PanoramaEstimation", - "position": [ - 1800, - 0 - ] - }, + ], + "describerTypes": "{FeatureMatching_1.describerTypes}" + } + }, "PanoramaInit_1": { + "nodeType": "PanoramaInit", + "position": [ + 1200, + 0 + ], "inputs": { - "useFisheye": true, + "input": "{FeatureExtraction_1.input}", "dependency": [ "{FeatureExtraction_1.output}" - ], - "input": "{FeatureExtraction_1.input}" - }, - "nodeType": "PanoramaInit", - "position": [ - 1200, - 0 - ] - }, + ], + "useFisheye": true + } + }, "FeatureMatching_1": { - "inputs": { - "describerTypes": "{FeatureExtraction_1.describerTypes}", - "imagePairsList": "{ImageMatching_1.output}", - "input": "{ImageMatching_1.input}", - "featuresFolders": "{ImageMatching_1.featuresFolders}" - }, - "nodeType": "FeatureMatching", + "nodeType": "FeatureMatching", "position": [ - 1600, + 1600, 0 - ] + ], + "inputs": { + "input": "{ImageMatching_1.input}", + "featuresFolders": "{ImageMatching_1.featuresFolders}", + "imagePairsList": "{ImageMatching_1.output}", + "describerTypes": "{FeatureExtraction_1.describerTypes}" + } }, "Publish_1": { "nodeType": "Publish", "position": [ - 3200, - 0 + 3209, + -22 ], "inputs": { "inputFiles": [ - "{ImageProcessing_1.outputImages}" + "{PanoramaPostProcessing_1.outputPanorama}" ] } } } -} +} \ No newline at end of file diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg index cbc9d6a8582..0d6771b5ee6 100644 --- a/meshroom/pipelines/panoramaHdr.mg +++ b/meshroom/pipelines/panoramaHdr.mg @@ -1,230 +1,231 @@ { "header": { "nodesVersions": { - "PanoramaMerging": "1.0", - "PanoramaSeams": "2.0", - "FeatureMatching": "2.0", - "PanoramaCompositing": "2.0", - "LdrToHdrMerge": "4.0", - "LdrToHdrSampling": "4.0", - "LdrToHdrCalibration": "3.0", - "PanoramaEstimation": "1.0", - "PanoramaInit": "2.0", - "CameraInit": "9.0", - "SfMTransform": "3.0", - "PanoramaPostProcessing": "1.0", - "ImageMatching": "2.0", - "FeatureExtraction": "1.1", - "PanoramaPrepareImages": "1.1", + "LdrToHdrCalibration": "3.0", + "ImageMatching": "2.0", + "PanoramaCompositing": "2.0", + "PanoramaPrepareImages": "1.1", + "SfMTransform": "3.0", + "FeatureMatching": "2.0", + "LdrToHdrSampling": "4.0", + "FeatureExtraction": "1.1", + "LdrToHdrMerge": "4.0", + "PanoramaMerging": "1.0", + "PanoramaPostProcessing": "1.0", + "PanoramaEstimation": "1.0", "PanoramaWarping": "1.0", - "Publish": "1.2" - }, - "releaseVersion": "2021.1.0", - "fileVersion": "1.1", + "Publish": "1.2", + "CameraInit": "9.0", + "PanoramaInit": "2.0", + "PanoramaSeams": "2.0" + }, + "releaseVersion": "2021.1.0", + "fileVersion": "1.1", "template": true - }, + }, "graph": { "LdrToHdrMerge_1": { + "nodeType": "LdrToHdrMerge", + "position": [ + 800, + 0 + ], "inputs": { - "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", - "byPass": "{LdrToHdrCalibration_1.byPass}", - "input": "{LdrToHdrCalibration_1.input}", - "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", + "input": "{LdrToHdrCalibration_1.input}", "response": "{LdrToHdrCalibration_1.response}", + "userNbBrackets": "{LdrToHdrCalibration_1.userNbBrackets}", + "byPass": "{LdrToHdrCalibration_1.byPass}", + "channelQuantizationPower": "{LdrToHdrCalibration_1.channelQuantizationPower}", "workingColorSpace": "{LdrToHdrCalibration_1.workingColorSpace}" - }, - "nodeType": "LdrToHdrMerge", + } + }, + "PanoramaWarping_1": { + "nodeType": "PanoramaWarping", "position": [ - 800, + 2200, 0 - ] - }, - "PanoramaWarping_1": { + ], "inputs": { "input": "{SfMTransform_1.output}" - }, - "nodeType": "PanoramaWarping", + } + }, + "LdrToHdrCalibration_1": { + "nodeType": "LdrToHdrCalibration", "position": [ - 2200, + 600, 0 - ] - }, - "LdrToHdrCalibration_1": { + ], "inputs": { - "samples": "{LdrToHdrSampling_1.output}", - "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", - "byPass": "{LdrToHdrSampling_1.byPass}", - "input": "{LdrToHdrSampling_1.input}", + "input": "{LdrToHdrSampling_1.input}", + "samples": "{LdrToHdrSampling_1.output}", "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}", - "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}", - "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}" - }, - "nodeType": "LdrToHdrCalibration", + "byPass": "{LdrToHdrSampling_1.byPass}", + "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}", + "channelQuantizationPower": "{LdrToHdrSampling_1.channelQuantizationPower}", + "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}" + } + }, + "LdrToHdrSampling_1": { + "nodeType": "LdrToHdrSampling", "position": [ - 600, + 400, 0 - ] - }, - "LdrToHdrSampling_1": { + ], "inputs": { "input": "{PanoramaPrepareImages_1.output}" - }, - "nodeType": "LdrToHdrSampling", + } + }, + "ImageMatching_1": { + "nodeType": "ImageMatching", "position": [ - 400, + 1400, 0 - ] - }, - "ImageMatching_1": { + ], "inputs": { - "input": "{PanoramaInit_1.outSfMData}", - "method": "FrustumOrVocabularyTree", + "input": "{PanoramaInit_1.outSfMData}", "featuresFolders": [ "{FeatureExtraction_1.output}" - ] - }, - "nodeType": "ImageMatching", + ], + "method": "FrustumOrVocabularyTree" + } + }, + "FeatureExtraction_1": { + "nodeType": "FeatureExtraction", "position": [ - 1400, + 1000, 0 - ] - }, - "FeatureExtraction_1": { + ], "inputs": { - "describerQuality": "high", - "input": "{LdrToHdrMerge_1.outSfMData}" - }, - "nodeType": "FeatureExtraction", + "input": "{LdrToHdrMerge_1.outSfMData}", + "describerQuality": "high" + } + }, + "PanoramaMerging_1": { + "nodeType": "PanoramaMerging", "position": [ - 1000, + 2800, 0 - ] - }, - "PanoramaMerging_1": { + ], "inputs": { - "compositingFolder": "{PanoramaCompositing_1.output}", - "input": "{PanoramaCompositing_1.input}" - }, - "nodeType": "PanoramaMerging", + "input": "{PanoramaCompositing_1.input}", + "compositingFolder": "{PanoramaCompositing_1.output}", + "useTiling": "{PanoramaCompositing_1.useTiling}" + } + }, + "PanoramaCompositing_1": { + "nodeType": "PanoramaCompositing", "position": [ - 2800, + 2600, 0 - ] - }, - "PanoramaCompositing_1": { + ], "inputs": { - "warpingFolder": "{PanoramaSeams_1.warpingFolder}", - "labels": "{PanoramaSeams_1.output}", - "input": "{PanoramaSeams_1.outputSfm}" - }, - "nodeType": "PanoramaCompositing", + "input": "{PanoramaSeams_1.outputSfm}", + "warpingFolder": "{PanoramaSeams_1.warpingFolder}", + "labels": "{PanoramaSeams_1.output}" + } + }, + "CameraInit_1": { + "nodeType": "CameraInit", "position": [ - 2600, + 0, 0 - ] - }, - "CameraInit_1": { + ], "inputs": { "allowedCameraModels": [ - "pinhole", - "radial1", - "radial3", - "brown", - "fisheye1", - "3deanamorphic4", - "3deradial4", + "pinhole", + "radial1", + "radial3", + "brown", + "fisheye1", + "3deanamorphic4", + "3deradial4", "3declassicld" ] - }, - "nodeType": "CameraInit", + } + }, + "PanoramaPostProcessing_1": { + "nodeType": "PanoramaPostProcessing", "position": [ - 0, + 3000, 0 - ] - }, - "PanoramaPostProcessing_1": { + ], "inputs": { - "inputPanorama": "{PanoramaMerging_1.outputPanorama}", + "inputPanorama": "{PanoramaMerging_1.outputPanorama}", "fillHoles": true - }, - "nodeType": "PanoramaPostProcessing", + } + }, + "PanoramaPrepareImages_1": { + "nodeType": "PanoramaPrepareImages", "position": [ - 3007, + 200, 0 - ] - }, - "PanoramaPrepareImages_1": { + ], "inputs": { "input": "{CameraInit_1.output}" - }, - "nodeType": "PanoramaPrepareImages", + } + }, + "SfMTransform_1": { + "nodeType": "SfMTransform", "position": [ - 200, + 2000, 0 - ] - }, - "SfMTransform_1": { + ], "inputs": { - "method": "manual", - "input": "{PanoramaEstimation_1.output}" - }, - "nodeType": "SfMTransform", + "input": "{PanoramaEstimation_1.output}", + "method": "manual" + } + }, + "PanoramaSeams_1": { + "nodeType": "PanoramaSeams", "position": [ - 2000, + 2400, 0 - ] - }, - "PanoramaSeams_1": { + ], "inputs": { - "input": "{PanoramaWarping_1.input}", + "input": "{PanoramaWarping_1.input}", "warpingFolder": "{PanoramaWarping_1.output}" - }, - "nodeType": "PanoramaSeams", + } + }, + "PanoramaEstimation_1": { + "nodeType": "PanoramaEstimation", "position": [ - 2400, + 1800, 0 - ] - }, - "PanoramaEstimation_1": { + ], "inputs": { + "input": "{FeatureMatching_1.input}", + "featuresFolders": "{FeatureMatching_1.featuresFolders}", "matchesFolders": [ "{FeatureMatching_1.output}" - ], - "input": "{FeatureMatching_1.input}", - "describerTypes": "{FeatureMatching_1.describerTypes}", - "featuresFolders": "{FeatureMatching_1.featuresFolders}" - }, - "nodeType": "PanoramaEstimation", + ], + "describerTypes": "{FeatureMatching_1.describerTypes}" + } + }, + "PanoramaInit_1": { + "nodeType": "PanoramaInit", "position": [ - 1800, + 1200, 0 - ] - }, - "PanoramaInit_1": { + ], "inputs": { + "input": "{FeatureExtraction_1.input}", "dependency": [ "{FeatureExtraction_1.output}" - ], - "input": "{FeatureExtraction_1.input}" - }, - "nodeType": "PanoramaInit", - "position": [ - 1200, - 0 - ] - }, + ] + } + }, "FeatureMatching_1": { - "inputs": { - "describerTypes": "{FeatureExtraction_1.describerTypes}", - "imagePairsList": "{ImageMatching_1.output}", - "input": "{ImageMatching_1.input}", - "featuresFolders": "{ImageMatching_1.featuresFolders}" - }, - "nodeType": "FeatureMatching", + "nodeType": "FeatureMatching", "position": [ - 1600, + 1600, 0 - ] + ], + "inputs": { + "input": "{ImageMatching_1.input}", + "featuresFolders": "{ImageMatching_1.featuresFolders}", + "imagePairsList": "{ImageMatching_1.output}", + "describerTypes": "{FeatureExtraction_1.describerTypes}" + } }, "Publish_1": { "nodeType": "Publish", @@ -234,9 +235,9 @@ ], "inputs": { "inputFiles": [ - "{ImageProcessing_1.outputImages}" + "{PanoramaPostProcessing_1.outputPanorama}" ] } } } -} +} \ No newline at end of file