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

[nodes] HDR Fusion: Fix bracket detection

Browse source 
Prior to this commit, only the shutter speed was compared between two
images to determine whether they belonged to the same group. The fnumber
and ISO were assumed to be fixed within a group, which is not always true,
and differs from what is done on the AliceVision's side.

This commit aligns Meshroom's bracket detection with AliceVision's.
This commit is contained in:
Candice Bentéjac 2023-08-04 12:08:38 +02:00
parent c27847db5a
commit 162e5c99eb
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -238,7 +238,7 @@ Calibrate LDR to HDR response curve from samples.
fnumber, shutterSpeed, iso = exp
if exposures:
prevFnumber, prevShutterSpeed, prevIso = exposures[-1]
if exposures and len(exposures) > 1 and (fnumber != prevFnumber or shutterSpeed > prevShutterSpeed or iso != prevIso) or newGroup:
if exposures and len(exposures) > 1 and (fnumber > prevFnumber or shutterSpeed > prevShutterSpeed or iso < prevIso) or newGroup:
exposureGroups.append(exposures)
exposures = [exp]
else:
@ -273,5 +273,4 @@ Calibrate LDR to HDR response curve from samples.
bestTuple = tuple if tuple[0] > bestTuple[0] else bestTuple
bestBracketSize = bestTuple[0]
bestCount = bestTuple[1]
node.nbBrackets.value = bestBracketSize

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

@ -324,7 +324,7 @@ Merge LDR images into HDR images.
fnumber, shutterSpeed, iso = exp
if exposures:
prevFnumber, prevShutterSpeed, prevIso = exposures[-1]
if exposures and len(exposures) > 1 and (fnumber != prevFnumber or shutterSpeed > prevShutterSpeed or iso != prevIso) or newGroup:
if exposures and len(exposures) > 1 and (fnumber > prevFnumber or shutterSpeed > prevShutterSpeed or iso < prevIso) or newGroup:
exposureGroups.append(exposures)
exposures = [exp]
else:
@ -359,7 +359,6 @@ Merge LDR images into HDR images.
bestTuple = tuple if tuple[0] > bestTuple[0] else bestTuple
bestBracketSize = bestTuple[0]
bestCount = bestTuple[1]
node.nbBrackets.value = bestBracketSize
def processChunk(self, chunk):

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

@ -264,7 +264,7 @@ Sample pixels from Low range images for HDR creation.
fnumber, shutterSpeed, iso = exp
if exposures:
prevFnumber, prevShutterSpeed, prevIso = exposures[-1]
if exposures and len(exposures) > 1 and (fnumber != prevFnumber or shutterSpeed > prevShutterSpeed or iso != prevIso) or newGroup:
if exposures and len(exposures) > 1 and (fnumber > prevFnumber or shutterSpeed > prevShutterSpeed or iso < prevIso) or newGroup:
exposureGroups.append(exposures)
exposures = [exp]
else: