[pipelines] PanoramaFisheyeHdr: Run FeatureExtraction after PanoramaInit

The `FeatureExtraction` node will thus be able to use the fisheye
circle information obtained with `PanoramaInit` to only extract features
within that circle.
This commit is contained in:
Candice Bentéjac 2024-01-15 12:33:48 +01:00
parent cfbf9bb5cd
commit c02f02d6f3

View file

@ -1,23 +1,23 @@
{ {
"header": { "header": {
"nodesVersions": { "nodesVersions": {
"PanoramaEstimation": "1.0",
"LdrToHdrCalibration": "3.1",
"PanoramaPostProcessing": "2.0",
"FeatureMatching": "2.0",
"PanoramaPrepareImages": "1.1",
"FeatureExtraction": "1.3", "FeatureExtraction": "1.3",
"PanoramaSeams": "2.0", "PanoramaSeams": "2.0",
"PanoramaPostProcessing": "2.0",
"PanoramaWarping": "1.1",
"LdrToHdrMerge": "4.1",
"PanoramaMerging": "1.0",
"Publish": "1.3",
"PanoramaEstimation": "1.0",
"CameraInit": "9.0",
"LdrToHdrCalibration": "3.1",
"ImageMatching": "2.0",
"LdrToHdrSampling": "4.0",
"PanoramaPrepareImages": "1.1",
"FeatureMatching": "2.0",
"PanoramaCompositing": "2.0", "PanoramaCompositing": "2.0",
"PanoramaInit": "2.0",
"PanoramaWarping": "1.1",
"PanoramaMerging": "1.0",
"SfMTransform": "3.1", "SfMTransform": "3.1",
"PanoramaInit": "2.0" "LdrToHdrSampling": "4.0",
"Publish": "1.3",
"ImageMatching": "2.0",
"LdrToHdrMerge": "4.1",
"CameraInit": "9.0"
}, },
"releaseVersion": "2024.1.0-develop", "releaseVersion": "2024.1.0-develop",
"fileVersion": "1.1", "fileVersion": "1.1",
@ -42,7 +42,7 @@
"PanoramaWarping_1": { "PanoramaWarping_1": {
"nodeType": "PanoramaWarping", "nodeType": "PanoramaWarping",
"position": [ "position": [
2000, 2200,
0 0
], ],
"inputs": { "inputs": {
@ -78,11 +78,11 @@
"ImageMatching_1": { "ImageMatching_1": {
"nodeType": "ImageMatching", "nodeType": "ImageMatching",
"position": [ "position": [
1200, 1400,
0 0
], ],
"inputs": { "inputs": {
"input": "{PanoramaInit_1.outSfMData}", "input": "{FeatureExtraction_1.input}",
"featuresFolders": [ "featuresFolders": [
"{FeatureExtraction_1.output}" "{FeatureExtraction_1.output}"
], ],
@ -92,11 +92,11 @@
"FeatureExtraction_1": { "FeatureExtraction_1": {
"nodeType": "FeatureExtraction", "nodeType": "FeatureExtraction",
"position": [ "position": [
1000, 1200,
70 0
], ],
"inputs": { "inputs": {
"input": "{LdrToHdrMerge_1.outSfMData}", "input": "{PanoramaInit_1.outSfMData}",
"describerTypes": [ "describerTypes": [
"sift" "sift"
], ],
@ -107,7 +107,7 @@
"PanoramaMerging_1": { "PanoramaMerging_1": {
"nodeType": "PanoramaMerging", "nodeType": "PanoramaMerging",
"position": [ "position": [
2600, 2800,
0 0
], ],
"inputs": { "inputs": {
@ -119,7 +119,7 @@
"PanoramaCompositing_1": { "PanoramaCompositing_1": {
"nodeType": "PanoramaCompositing", "nodeType": "PanoramaCompositing",
"position": [ "position": [
2400, 2600,
0 0
], ],
"inputs": { "inputs": {
@ -151,7 +151,7 @@
"PanoramaPostProcessing_1": { "PanoramaPostProcessing_1": {
"nodeType": "PanoramaPostProcessing", "nodeType": "PanoramaPostProcessing",
"position": [ "position": [
2800, 3000,
0 0
], ],
"inputs": { "inputs": {
@ -172,7 +172,7 @@
"SfMTransform_1": { "SfMTransform_1": {
"nodeType": "SfMTransform", "nodeType": "SfMTransform",
"position": [ "position": [
1800, 2000,
0 0
], ],
"inputs": { "inputs": {
@ -183,7 +183,7 @@
"PanoramaSeams_1": { "PanoramaSeams_1": {
"nodeType": "PanoramaSeams", "nodeType": "PanoramaSeams",
"position": [ "position": [
2200, 2400,
0 0
], ],
"inputs": { "inputs": {
@ -194,7 +194,7 @@
"PanoramaEstimation_1": { "PanoramaEstimation_1": {
"nodeType": "PanoramaEstimation", "nodeType": "PanoramaEstimation",
"position": [ "position": [
1600, 1800,
0 0
], ],
"inputs": { "inputs": {
@ -210,7 +210,7 @@
"nodeType": "PanoramaInit", "nodeType": "PanoramaInit",
"position": [ "position": [
1000, 1000,
-50 0
], ],
"inputs": { "inputs": {
"input": "{LdrToHdrMerge_1.outSfMData}", "input": "{LdrToHdrMerge_1.outSfMData}",
@ -220,7 +220,7 @@
"FeatureMatching_1": { "FeatureMatching_1": {
"nodeType": "FeatureMatching", "nodeType": "FeatureMatching",
"position": [ "position": [
1400, 1600,
0 0
], ],
"inputs": { "inputs": {
@ -234,7 +234,7 @@
"Publish_1": { "Publish_1": {
"nodeType": "Publish", "nodeType": "Publish",
"position": [ "position": [
3000, 3200,
0 0
], ],
"inputs": { "inputs": {