Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stitching color space #1937

Merged
merged 7 commits into from
Jun 12, 2023
Merged

Stitching color space #1937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
da0a1f4
[Node] FeatureExtraction: Add working color space
demoulinv Mar 14, 2023
97e3116
[Node] panoramaWarping: Add output color space option
demoulinv Mar 14, 2023
edb0f16
[Node] cameraInit: Add dcpMetadata as choice for raw color interpreta…
demoulinv Mar 15, 2023
065e1f6
[Nodes] PanoramaWarping: rename outputColorSpace in workingColorSpace
demoulinv Mar 24, 2023
5a7268f
[nodes] PanoramaWarping: Update version and parameter description
cbentejac Jun 9, 2023
2c20c1d
[nodes] FeatureExtraction: Update version
cbentejac Jun 9, 2023
4c05a12
[pipelines] Update versions for `FeatureExtraction` and `PanoramaWarp…
cbentejac Jun 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meshroom/nodes/aliceVision/CameraInit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class CameraInit(desc.AVCommandLineNode, desc.InitNode):
'DCPLinearProcessing: Use DCP color profile.\n'
'DCPMetadata: Same as None with DCP info added in metadata.',
value='DCPLinearProcessing' if os.environ.get('ALICEVISION_COLOR_PROFILE_DB', '') else 'LibRawWhiteBalancing',
values=['None', 'LibRawNoWhiteBalancing', 'LibRawWhiteBalancing', 'DCPLinearProcessing'],
values=['None', 'LibRawNoWhiteBalancing', 'LibRawWhiteBalancing', 'DCPLinearProcessing', 'DCPMetadata'],
exclusive=True,
uid=[0],
),
Expand Down
11 changes: 10 additions & 1 deletion meshroom/nodes/aliceVision/FeatureExtraction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.1"
__version__ = "1.2"

from meshroom.core import desc

Expand Down Expand Up @@ -120,6 +120,15 @@ class FeatureExtraction(desc.AVCommandLineNode):
advanced=True,
uid=[0],
),
desc.ChoiceParam(
name='workingColorSpace',
label='Working Color Space',
description='Allows you to choose the color space in which the data are processed.',
value='sRGB',
values=['sRGB', 'Linear', 'ACES2065-1', 'ACEScg', 'no_conversion'],
exclusive=True,
uid=[0],
),
desc.BoolParam(
name='forceCpuExtraction',
label='Force CPU Extraction',
Expand Down
11 changes: 10 additions & 1 deletion meshroom/nodes/aliceVision/PanoramaWarping.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__version__ = "1.0"
__version__ = "1.1"

import json
import os
Expand Down Expand Up @@ -66,6 +66,15 @@ class PanoramaWarping(desc.AVCommandLineNode):
enabled=lambda node: (node.estimateResolution.value),
),
desc.ChoiceParam(
name='workingColorSpace',
label='Working Color Space',
description='Colorspace in which the panorama warping will be performed.',
value='Linear',
values=['Linear', 'ACES2065-1', 'ACEScg', 'no_conversion'],
exclusive=True,
uid=[0],
),
desc.ChoiceParam(
name='storageDataType',
label='Storage Data Type',
description='Storage image data type:\n'
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/cameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"fileVersion": "1.1",
"template": true,
"nodesVersions": {
"FeatureExtraction": "1.1",
"FeatureExtraction": "1.2",
"CameraInit": "9.0",
"DepthMap": "3.0",
"SfMTriangulation": "1.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/pipelines/panoramaFisheyeHdr.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"SfMTransform": "3.0",
"PanoramaPostProcessing": "1.0",
"ImageMatching": "2.0",
"FeatureExtraction": "1.1",
"FeatureExtraction": "1.2",
"PanoramaPrepareImages": "1.1",
"PanoramaWarping": "1.0",
"PanoramaWarping": "1.1",
"Publish": "1.3"
},
"releaseVersion": "2023.1.0",
Expand Down
4 changes: 2 additions & 2 deletions meshroom/pipelines/panoramaHdr.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"SfMTransform": "3.0",
"PanoramaPostProcessing": "1.0",
"ImageMatching": "2.0",
"FeatureExtraction": "1.1",
"FeatureExtraction": "1.2",
"PanoramaPrepareImages": "1.1",
"PanoramaWarping": "1.0",
"PanoramaWarping": "1.1",
"Publish": "1.3"
},
"releaseVersion": "2023.1.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photogrammetry.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"StructureFromMotion": "3.0",
"CameraInit": "9.0",
"ImageMatching": "2.0",
"FeatureExtraction": "1.1",
"FeatureExtraction": "1.2",
"Meshing": "7.0",
"DepthMapFilter": "3.0",
"Publish": "1.3"
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photogrammetryAndCameraTracking.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"nodesVersions": {
"Publish": "1.3",
"StructureFromMotion": "3.0",
"FeatureExtraction": "1.1",
"FeatureExtraction": "1.2",
"FeatureMatching": "2.0",
"CameraInit": "9.0",
"ImageMatchingMultiSfM": "1.0",
Expand Down
2 changes: 1 addition & 1 deletion meshroom/pipelines/photogrammetryDraft.mg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"StructureFromMotion": "3.0",
"CameraInit": "9.0",
"ImageMatching": "2.0",
"FeatureExtraction": "1.1",
"FeatureExtraction": "1.2",
"Meshing": "7.0",
"Publish": "1.3"
},
Expand Down