3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-05-22 13:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

tolerant bracket size selection

Browse source
This commit is contained in:
Fabien SERVANT 2023-07-13 15:04:56 +02:00
parent 9d09e851b2
commit 6a0583d8e5
3 changed files with 42 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

19
meshroom/nodes/aliceVision/LdrToHdrCalibration.py
View file

@ -1,6 +1,7 @@
__version__ = "3.0" __version__ = "3.0"
import json import json
from collections import Counter
from meshroom.core import desc from meshroom.core import desc
@ -229,7 +230,7 @@ Calibrate LDR to HDR response curve from samples.
exposureGroups.append(exposures) exposureGroups.append(exposures)
exposures = None exposures = None
bracketSizes = set() bracketSizes = Counter()
if len(exposureGroups) == 1: if len(exposureGroups) == 1:
if len(set(exposureGroups[0])) == 1: if len(set(exposureGroups[0])) == 1:
# Single exposure and multiple views # Single exposure and multiple views
@ -239,8 +240,16 @@ Calibrate LDR to HDR response curve from samples.
node.nbBrackets.value = len(exposureGroups[0]) node.nbBrackets.value = len(exposureGroups[0])
else: else:
for expGroup in exposureGroups: for expGroup in exposureGroups:
bracketSizes.add(len(expGroup)) bracketSizes[len(expGroup)] += 1
if len(bracketSizes) == 1:
node.nbBrackets.value = bracketSizes.pop() if len(bracketSizes) == 0:
else:
node.nbBrackets.value = 0 node.nbBrackets.value = 0
else:
bestTuple = bracketSizes.most_common(1)[0]
bestBracketSize = bestTuple[0]
bestCount = bestTuple[1]
total = bestBracketSize * bestCount
if len(inputs) - total < 2:
node.nbBrackets.value = bestBracketSize
else:
node.nbBrackets.value = 0

19
meshroom/nodes/aliceVision/LdrToHdrMerge.py
View file

@ -1,6 +1,7 @@
__version__ = "4.1" __version__ = "4.1"
import json import json
from collections import Counter
from meshroom.core import desc from meshroom.core import desc
@ -321,7 +322,7 @@ Merge LDR images into HDR images.
exposureGroups.append(exposures) exposureGroups.append(exposures)
exposures = None exposures = None
bracketSizes = set() bracketSizes = Counter()
if len(exposureGroups) == 1: if len(exposureGroups) == 1:
if len(set(exposureGroups[0])) == 1: if len(set(exposureGroups[0])) == 1:
# Single exposure and multiple views # Single exposure and multiple views
@ -331,8 +332,16 @@ Merge LDR images into HDR images.
node.nbBrackets.value = len(exposureGroups[0]) node.nbBrackets.value = len(exposureGroups[0])
else: else:
for expGroup in exposureGroups: for expGroup in exposureGroups:
bracketSizes.add(len(expGroup)) bracketSizes[len(expGroup)] += 1
if len(bracketSizes) == 1:
node.nbBrackets.value = bracketSizes.pop() if len(bracketSizes) == 0:
else:
node.nbBrackets.value = 0 node.nbBrackets.value = 0
else:
bestTuple = bracketSizes.most_common(1)[0]
bestBracketSize = bestTuple[0]
bestCount = bestTuple[1]
total = bestBracketSize * bestCount
if len(inputs) - total < 2:
node.nbBrackets.value = bestBracketSize
else:
node.nbBrackets.value = 0

19
meshroom/nodes/aliceVision/LdrToHdrSampling.py
View file

@ -1,6 +1,7 @@
__version__ = "4.0" __version__ = "4.0"
import json import json
from collections import Counter
from meshroom.core import desc from meshroom.core import desc
@ -250,7 +251,7 @@ Sample pixels from Low range images for HDR creation.
exposureGroups.append(exposures) exposureGroups.append(exposures)
exposures = None exposures = None
bracketSizes = set() bracketSizes = Counter()
if len(exposureGroups) == 1: if len(exposureGroups) == 1:
if len(set(exposureGroups[0])) == 1: if len(set(exposureGroups[0])) == 1:
# Single exposure and multiple views # Single exposure and multiple views
@ -260,8 +261,16 @@ Sample pixels from Low range images for HDR creation.
node.nbBrackets.value = len(exposureGroups[0]) node.nbBrackets.value = len(exposureGroups[0])
else: else:
for expGroup in exposureGroups: for expGroup in exposureGroups:
bracketSizes.add(len(expGroup)) bracketSizes[len(expGroup)] += 1
if len(bracketSizes) == 1:
node.nbBrackets.value = bracketSizes.pop() if len(bracketSizes) == 0:
else:
node.nbBrackets.value = 0 node.nbBrackets.value = 0
else:
bestTuple = bracketSizes.most_common(1)[0]
bestBracketSize = bestTuple[0]
bestCount = bestTuple[1]
total = bestBracketSize * bestCount
if len(inputs) - total < 2:
node.nbBrackets.value = bestBracketSize
else:
node.nbBrackets.value = 0