Merge pull request #1849 from alicevision/LdrToHdrMerging_checkbox

Ldr to hdr merging checkbox
alicevision · Feb 14, 2023 · 6c5fea5 · 6c5fea5
2 parents 334bfc8 + 4a8232f
commit 6c5fea5
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 7 deletions.
diff --git a/meshroom/nodes/aliceVision/LdrToHdrCalibration.py b/meshroom/nodes/aliceVision/LdrToHdrCalibration.py
@@ -72,7 +72,6 @@ class LdrToHdrCalibration(desc.AVCommandLineNode):
             description="Bypass HDR creation and use the medium bracket as the source for the next steps",
             value=False,
             uid=[0],
-            group='internal',
             enabled= lambda node: node.nbBrackets.value != 1,
         ),
         desc.ChoiceParam(
@@ -158,7 +157,7 @@ class LdrToHdrCalibration(desc.AVCommandLineNode):
     ]
 
     def processChunk(self, chunk):
-        if chunk.node.nbBrackets.value == 1 or chunk.node.byPass.value:
+        if chunk.node.nbBrackets.value == 1:
             return
         super(LdrToHdrCalibration, self).processChunk(chunk)
 

diff --git a/meshroom/nodes/aliceVision/LdrToHdrMerge.py b/meshroom/nodes/aliceVision/LdrToHdrMerge.py
@@ -65,14 +65,31 @@ class LdrToHdrMerge(desc.AVCommandLineNode):
             range=(0, 10, 1),
             uid=[0],
         ),
+        desc.BoolParam(
+            name='offsetRefBracketIndexEnabled',
+            label='Manually Specify Ref Bracket',
+            description='Manually specify the reference bracket index to control the exposure of the HDR image.',
+            value=False,
+            uid=[0],
+            group='user',  # not used directly on the command line
+        ),
         desc.IntParam(
             name='offsetRefBracketIndex',
             label='Offset Ref Bracket Index',
             description='Zero to use the center bracket. +N to use a more exposed bracket or -N to use a less exposed backet.',
             value=1,
             range=(-4, 4, 1),
             uid=[0],
-            enabled= lambda node: node.nbBrackets.value != 1,
+            enabled= lambda node: (node.nbBrackets.value != 1 and node.offsetRefBracketIndexEnabled.value),
+        ),
+        desc.FloatParam(
+            name='meanTargetedLumaForMerging',
+            label='Targeted Luminance For Merging',
+            description='Expected mean luminance of the HDR images used to compute the final panorama',
+            value=0.4,
+            range=(0.0, 1.0, 0.01),
+            uid=[0],
+            enabled= lambda node: (node.nbBrackets.value != 1 and not node.offsetRefBracketIndexEnabled.value),
         ),
         desc.BoolParam(
             name='byPass',

diff --git a/meshroom/nodes/aliceVision/LdrToHdrSampling.py b/meshroom/nodes/aliceVision/LdrToHdrSampling.py
@@ -81,9 +81,23 @@ class LdrToHdrSampling(desc.AVCommandLineNode):
             description="Bypass HDR creation and use the medium bracket as the source for the next steps",
             value=False,
             uid=[0],
-            group='internal',
             enabled= lambda node: node.nbBrackets.value != 1,
         ),
+        desc.ChoiceParam(
+            name='calibrationMethod',
+            label='Calibration Method',
+            description="Method used for camera calibration \n"
+                        " * Linear: Disable the calibration and assumes a linear Camera Response Function. If images are encoded in a known colorspace (like sRGB for JPEG), the images will be automatically converted to linear. \n"
+                        " * Debevec: This is the standard method for HDR calibration. \n"
+                        " * Grossberg: Based on learned database of cameras, it allows to reduce the CRF to few parameters while keeping all the precision. \n"
+                        " * Laguerre: Simple but robust method estimating the minimal number of parameters. \n"
+                        " * Robertson: First method for HDR calibration in the literature. \n",
+            values=['linear', 'debevec', 'grossberg', 'laguerre'],
+            value='debevec',
+            exclusive=True,
+            uid=[0],
+            enabled= lambda node: node.byPass.enabled and not node.byPass.value,
+        ),
         desc.IntParam(
             name='channelQuantizationPower',
             label='Channel Quantization Power',
@@ -164,7 +178,7 @@ class LdrToHdrSampling(desc.AVCommandLineNode):
     ]
 
     def processChunk(self, chunk):
-        if chunk.node.nbBrackets.value == 1 or chunk.node.byPass.value:
+        if chunk.node.nbBrackets.value == 1:
             return
         super(LdrToHdrSampling, self).processChunk(chunk)
 

diff --git a/meshroom/pipelines/panoramaFisheyeHdr.mg b/meshroom/pipelines/panoramaFisheyeHdr.mg
@@ -68,7 +68,8 @@
                 "byPass": "{LdrToHdrSampling_1.byPass}", 
                 "input": "{LdrToHdrSampling_1.input}", 
                 "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}",
-                "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}"
+                "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}",
+                "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}"
             }, 
             "nodeType": "LdrToHdrCalibration", 
             "position": [

diff --git a/meshroom/pipelines/panoramaHdr.mg b/meshroom/pipelines/panoramaHdr.mg
@@ -68,7 +68,8 @@
                 "byPass": "{LdrToHdrSampling_1.byPass}", 
                 "input": "{LdrToHdrSampling_1.input}", 
                 "userNbBrackets": "{LdrToHdrSampling_1.userNbBrackets}",
-                "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}"
+                "workingColorSpace": "{LdrToHdrSampling_1.workingColorSpace}",
+                "calibrationMethod": "{LdrToHdrSampling_1.calibrationMethod}"
             }, 
             "nodeType": "LdrToHdrCalibration", 
             "position": [