Commit Graph

361 Commits

Author SHA1 Message Date
rom9
22eee9787e Film negative stable multipliers (#5485)
* Added new feature to calculate channel multipliers from crop area. This also saves the crop area channel medians to the processing profiles, in order to get a more consistent color balance when batch-applying the same profile to multiple pictures from the same film roll.

* Fixed wrong initialization of array, and missing check for the result of `getFilmNegativeMedians()`.
Moved `ImProcCoordinator::translateCoord()` from private member to anonymous namespace.
Fixed some whitespace and formatting issues.

* Fixed some formatting issues

* Passed `ipf` parameter as const in `translateCoord`.
Narrowed `using namespace` to single class `Coord2D`.

* Added `scaleGain` entry to thumbnail metadata file, to make `scale_mul` multipliers available in thumbnail processing phase. This simplifies multiplier calculations, so that "faking" thumbnail multipliers in the main image processing is not necessary anymore. This way, output values are immune to slight variations of multipliers between successive shots taken with in-camera AWB turned on.
Shifted multipliers so that the output channel medians are balanced when "Camera WB" is selected. This way, just computing multipliers from crop and setting "Camera WB" (which is the default) gives a pretty well balanced image as a starting point.

* New channel scaling method, based on a film base color sample instead of crop area channel medians. Channels are scaled so that the converted film base values are equal to 1/512th of the output range (65k). This giver better black levels in the output, and more consistency when batch-processing multiple negatives.
The output is now compensated for a known fixed WB value, so that the film base will appear grey when WB is set to 3500K, Green=1.
Added PPVERSION 347 to preserve backwards compatibility: when a processing profile saved by RT 5.7 is loaded (PPVERSION=346), the new fields are initialized to the special value -1, which will instruct the main processing to follow the old channel scaling behaviour. The old channel scaling multipliers will then be converted to the new film base values so that the resulting image is the same, and the fields will be overwritten as soon as the PP is saved again. This will transparently upgrade the processing profile.
When the new behaviour is used, but the film base values are still unset, they are estimated based on channel medians, excluding a 20% border around the image. This should give a better result out-of-the-box for pictures containing a large film holder.

* Code cleanup from review

* Run astyle on film neg source files

* Fixed automated build failure caused by incompatible libraries on my dev PC.

* Simplified `Thumbnail::processFilmNegative` method signature. There is no need to pass in `rmi`,`gmi`,`bmi` multipliers from the caller, i can do the same with my own internal multipliers.

* Added `FilmNegListener` class to pass estimeted film base values to the GUI after first processing. Removed old `filmBaseValues` instance variable from RawImageSource.

* Code cleanup

* Forgot to set baseValues flag in `PartialPasteDlg::applyPaste`
Fixed `filmBaseValuesLabel` not updating when reading zero baseValues. Normally not needed (the label is updated later by the listener), but when the user is browsing through pictures the listener won't fire, so the label must be updated to show values are unset.

* Overwritten channel scaling multipliers by calling `get_colorsCoeff` with `forceAutoWB=false`.
Initially, in `RawImageSource::load`, channels are auto-balanced by averaging the whole picture when computing multipliers.
This can give different multipliers for multiple shots of the same camera, which will lead to inconsistent conversions when batch-processing multiple negatives.
This commit re-sets `scale_mul`, `ref_pre_mul`, etc., in order to "undo" the auto-WB and use the normal camera multipliers.

* Found an easier way to get stable overall multipliers, removed the (horrible) on-the-fly mutation of scaling instance variables.
2020-04-13 17:20:56 +02:00
Desmis
31355ca70e Added equalizer denoise luminance 2020-04-06 09:37:37 +02:00
Desmis
7d8e0abd2f Clean code and change default values 2020-04-04 15:37:22 +02:00
Desmis
61c6b19533 GUI for wavelt denoise chroma 2020-04-02 12:32:29 +02:00
Desmis
b8749f708c Added effect to edge sharpness 2020-03-31 14:24:17 +02:00
Desmis
0fa2ca79c2 Improvment contrast to prevent texture and noise 2020-03-30 08:54:26 +02:00
Desmis
a61463447a Improvment to Blur levels 2020-03-28 08:35:00 +01:00
Desmis
c836376766 Blur residual luma and chroma 2020-03-26 09:34:38 +01:00
Desmis
51f1198b65 Init blur by levels 2020-03-25 18:06:32 +01:00
Desmis
cdf8d8ec7f Wavelet - added offset to contrast levels 2020-03-25 07:15:27 +01:00
Desmis
6d154bcdae Wavelet - Give possibility to use old algo SH residual image 2020-03-24 11:29:50 +01:00
Desmis
1f4613cd3b GUI for TM wavelet 2020-03-22 10:37:21 +01:00
Desmis
05f365c0d6 Added method Illuminant to make choices easier in free mode 2020-03-04 16:31:49 +01:00
Desmis
f4da001589 Ciecam02 autotempout button 2020-03-02 20:00:02 +01:00
Ingo Weyrich
60caf17c7a Merge branch 'dev' into rawimagesource_cleanup 2020-02-29 09:35:33 +01:00
Ingo Weyrich
f7792aa936 some cleanups 2020-02-27 21:22:34 +01:00
Desmis
a2f7d39ad2 merge with dev 2020-02-27 08:51:11 +01:00
Ingo Weyrich
13e2bc4152 White balance shows wrong method when opening a file which was set to Auto in 5.8, #5668 2020-02-26 18:32:32 +01:00
Desmis
8cfc4e33af partial fixed wrong old WB auto 2020-02-26 15:22:28 +01:00
Desmis
603b55e690 Preset cat02 automatic 2020-02-25 17:28:19 +01:00
Desmis
74c40382c8 merge with dev 2020-02-25 07:56:36 +01:00
Desmis
92fc0e307f merge with dev 2020-02-24 11:09:20 +01:00
Desmis
81c6e4635d merge with dev 2020-02-24 11:05:55 +01:00
Flössie
1069c890f5 Incorporate FreeBSD fix from @mandree (#5651) plus a little hardening 2020-02-14 11:44:57 +01:00
Ingo Weyrich
b2443b0e7e more double promote fixes, still not complete 2020-01-21 00:16:27 +01:00
Desmis
ba7a61c391 merge with dev 2020-01-13 08:33:45 +01:00
Desmis
4e81cbaa72 merge with dev 2020-01-13 08:02:43 +01:00
Ingo Weyrich
49d594f67a Log transform: add method combobox 2020-01-02 19:28:57 +01:00
Desmis
025f444d7e Improve contrast levels with sigma 2019-12-15 08:21:41 +01:00
Desmis
d701afdef0 merge with dev 2019-12-01 06:56:16 +01:00
Desmis
c0da01cf9a merge with dev 2019-12-01 06:53:23 +01:00
Ingo Weyrich
f054ed00e8 Pixelshift: optionally use RCD+VNG4 for motion parts 2019-11-25 01:00:49 +01:00
Desmis
c58d2a1d75 merge with dev 2019-11-14 14:07:04 +01:00
Desmis
1311626888 merge with dev 2019-11-14 13:52:57 +01:00
Ingo Weyrich
3be7016517 Capture sharpening: Remove range adjuster and introduce 2019-11-13 21:05:24 +01:00
Ingo Weyrich
e525f5bec1 Capture sharpening: added range-adjuster to exclude bright areas from sharpening 2019-11-12 14:37:15 +01:00
Ingo Weyrich
d32c570383 Capture sharpening: removed gamma 2019-11-10 16:05:24 +01:00
Desmis
e8986731e8 merge with dev 2019-11-07 08:09:21 +01:00
Desmis
d621721ffe merge wit dev 2019-11-07 07:17:19 +01:00
Ingo Weyrich
6335b68a80 Further reduction of include dependencies 2019-11-03 14:52:42 +01:00
Ingo Weyrich
cac2eb53ef Further reduction of include dependencies 2019-10-31 20:41:08 +01:00
Desmis
cfdfd9f553 merge with dev 2019-10-12 08:50:16 +02:00
Morgan Hardwood
fa7ba481d7 Merge branch 'dev' into wavelenh 2019-09-25 12:43:57 +02:00
Ingo Weyrich
7a8225d274 procparams: apply changes requested by @Floessie in code review 2019-09-23 13:40:19 +02:00
Desmis
9c983a1c4e merge with dev 2019-09-23 13:07:34 +02:00
Desmis
f57d74ffbd merge with dev 2019-09-23 11:40:25 +02:00
Ingo Weyrich
0fc0eced5a Merge branch 'dev' into dehaze_speedup 2019-09-22 15:39:19 +02:00
Ingo Weyrich
7ff3192cc9 dehaze: added lumimance mode from ART, #5456, thanks to @agriggio 2019-09-20 14:03:09 +02:00
Desmis
9e9d0cd503 merge with dev 2019-09-17 11:11:43 +02:00
Desmis
332782ec9b merge with dev 2019-09-17 10:57:05 +02:00