| Message ID | 20260122161935.208562-1-mzamazal@redhat.com |
|---|---|
| Headers | show |
| Series |
|
| Related | show |
The series seems to work well on multiple devices, including qcom ones (FP5, OP6, Pixel3a) and the Librem5, thanks! Tested-by: Robert Mader<robert.mader@collabora.com> On 22.01.26 17:19, Milan Zamazal wrote: > The simple pipeline image algorithms inappropriately mix various stuff > together. For example, contrast and saturation processing is mixed with > CCM and LUT processing, algorithms cannot be disabled without making > software ISP malfunctioning and some "algorithms", like lookup table > construction, are not algorithms at all. > > This patch series introduces new algorithm Adjust for contrast, > saturation and gamma adjustments, moves lookup table construction to > debayering, separates CCM from the combined matrix (which includes white > balance and saturation adjustments), and cleans up some other things. > > Changes in v4: > - Remaining redundant <optional> include removed from adjust.h. > - Gamma value is reported in metadata. > - Contrast value is always reported in metadata. > - context.activeState.knobs.gamma is no longer std::optional. > - gpuIspEnabled removed from everywhere. > - Matrix comparison simplified as suggested by Barnabás. > - Multiple params_->combinedMatrix assignments replaced by a single one. > - Unused context.activeState.ccm removed. > - currentCcm_ wrapped by std::optional and ccmAssigned_ removed. > - kDefault* constants made constexpr. > - kDefaultContrast and kDefaultSaturation moved to adjust.cpp. > - Minor corrections in commit messages. > > Changes in v3: > - Rebased on the merged GPU ISP and adjusted for the changes there. > - A patch reverting enabling Ccm algorithm by GPU ISP added. > > Changes in v2: > - Commit message of "Generalise tracking matrix changes" improved a bit. > - correctionMatrix renamed to combinedMatrix. > - combinedMatrix initialisations fixed andMatrix::identity utilised. > - gamma made adjustable. > - Types of contrast, saturation, gamma set to float (from double in some > places). > - Symbolic constants are used for contrast, saturation, gamma defaults. > - The gain matrix is applied directly in awb.cpp now. > - Lut "algorithm" removed; lookup tables construction moved to > debayering. > > Milan Zamazal (15): > libcamera: ipa: simple: Remove an unused include from awb.cpp > libcamera: ipa: simple: Unwrap IPAFrameContext::ccm > libcamera: ipa: simple: Generalize tracking matrix changes > libcamera: ipa: simple: Rename "ccm" identifiers not specific to CCM > libcamera: ipa: simple: Introduce a general correction matrix > libcamera: ipa: simple: Initialise the general correction matrix > libcamera: ipa: simple: Separate saturation from CCM > libcamera: ipa: simple: Move contrast settings to adjust.cpp > libcamera: ipa: simple: Make gamma adjustable > libcamera: ipa: simple: Apply gain matrix in awb > libcamera: ipa: simple: Use float type for adjustment controls > libcamera: ipa: simple: Use symbolic constants for adjust defaults > libcamera: ipa: simple: Set contrast metadata unconditionally > libcamera: ipa: simple: Remove Lut algorithm > libcamera: ipa: simple: Disable Ccm algorithm by default again > > .../internal/software_isp/debayer_params.h | 45 +---- > include/libcamera/ipa/soft.mojom | 3 +- > src/ipa/simple/algorithms/adjust.cpp | 134 ++++++++++++++ > src/ipa/simple/algorithms/{lut.h => adjust.h} | 28 +-- > src/ipa/simple/algorithms/awb.cpp | 14 +- > src/ipa/simple/algorithms/ccm.cpp | 80 ++------ > src/ipa/simple/algorithms/ccm.h | 12 +- > src/ipa/simple/algorithms/lut.cpp | 174 ------------------ > src/ipa/simple/algorithms/meson.build | 2 +- > src/ipa/simple/data/uncalibrated.yaml | 14 +- > src/ipa/simple/ipa_context.h | 27 +-- > src/ipa/simple/soft_simple.cpp | 13 +- > src/libcamera/software_isp/debayer.cpp | 172 +---------------- > src/libcamera/software_isp/debayer.h | 8 - > src/libcamera/software_isp/debayer_cpu.cpp | 136 ++++++++++++-- > src/libcamera/software_isp/debayer_cpu.h | 26 ++- > src/libcamera/software_isp/debayer_egl.cpp | 27 ++- > src/libcamera/software_isp/software_isp.cpp | 29 +-- > 18 files changed, 370 insertions(+), 574 deletions(-) > create mode 100644 src/ipa/simple/algorithms/adjust.cpp > rename src/ipa/simple/algorithms/{lut.h => adjust.h} (57%) > delete mode 100644 src/ipa/simple/algorithms/lut.cpp >
The simple pipeline image algorithms inappropriately mix various stuff together. For example, contrast and saturation processing is mixed with CCM and LUT processing, algorithms cannot be disabled without making software ISP malfunctioning and some "algorithms", like lookup table construction, are not algorithms at all. This patch series introduces new algorithm Adjust for contrast, saturation and gamma adjustments, moves lookup table construction to debayering, separates CCM from the combined matrix (which includes white balance and saturation adjustments), and cleans up some other things. Changes in v4: - Remaining redundant <optional> include removed from adjust.h. - Gamma value is reported in metadata. - Contrast value is always reported in metadata. - context.activeState.knobs.gamma is no longer std::optional. - gpuIspEnabled removed from everywhere. - Matrix comparison simplified as suggested by Barnabás. - Multiple params_->combinedMatrix assignments replaced by a single one. - Unused context.activeState.ccm removed. - currentCcm_ wrapped by std::optional and ccmAssigned_ removed. - kDefault* constants made constexpr. - kDefaultContrast and kDefaultSaturation moved to adjust.cpp. - Minor corrections in commit messages. Changes in v3: - Rebased on the merged GPU ISP and adjusted for the changes there. - A patch reverting enabling Ccm algorithm by GPU ISP added. Changes in v2: - Commit message of "Generalise tracking matrix changes" improved a bit. - correctionMatrix renamed to combinedMatrix. - combinedMatrix initialisations fixed and Matrix::identity utilised. - gamma made adjustable. - Types of contrast, saturation, gamma set to float (from double in some places). - Symbolic constants are used for contrast, saturation, gamma defaults. - The gain matrix is applied directly in awb.cpp now. - Lut "algorithm" removed; lookup tables construction moved to debayering. Milan Zamazal (15): libcamera: ipa: simple: Remove an unused include from awb.cpp libcamera: ipa: simple: Unwrap IPAFrameContext::ccm libcamera: ipa: simple: Generalize tracking matrix changes libcamera: ipa: simple: Rename "ccm" identifiers not specific to CCM libcamera: ipa: simple: Introduce a general correction matrix libcamera: ipa: simple: Initialise the general correction matrix libcamera: ipa: simple: Separate saturation from CCM libcamera: ipa: simple: Move contrast settings to adjust.cpp libcamera: ipa: simple: Make gamma adjustable libcamera: ipa: simple: Apply gain matrix in awb libcamera: ipa: simple: Use float type for adjustment controls libcamera: ipa: simple: Use symbolic constants for adjust defaults libcamera: ipa: simple: Set contrast metadata unconditionally libcamera: ipa: simple: Remove Lut algorithm libcamera: ipa: simple: Disable Ccm algorithm by default again .../internal/software_isp/debayer_params.h | 45 +---- include/libcamera/ipa/soft.mojom | 3 +- src/ipa/simple/algorithms/adjust.cpp | 134 ++++++++++++++ src/ipa/simple/algorithms/{lut.h => adjust.h} | 28 +-- src/ipa/simple/algorithms/awb.cpp | 14 +- src/ipa/simple/algorithms/ccm.cpp | 80 ++------ src/ipa/simple/algorithms/ccm.h | 12 +- src/ipa/simple/algorithms/lut.cpp | 174 ------------------ src/ipa/simple/algorithms/meson.build | 2 +- src/ipa/simple/data/uncalibrated.yaml | 14 +- src/ipa/simple/ipa_context.h | 27 +-- src/ipa/simple/soft_simple.cpp | 13 +- src/libcamera/software_isp/debayer.cpp | 172 +---------------- src/libcamera/software_isp/debayer.h | 8 - src/libcamera/software_isp/debayer_cpu.cpp | 136 ++++++++++++-- src/libcamera/software_isp/debayer_cpu.h | 26 ++- src/libcamera/software_isp/debayer_egl.cpp | 27 ++- src/libcamera/software_isp/software_isp.cpp | 29 +-- 18 files changed, 370 insertions(+), 574 deletions(-) create mode 100644 src/ipa/simple/algorithms/adjust.cpp rename src/ipa/simple/algorithms/{lut.h => adjust.h} (57%) delete mode 100644 src/ipa/simple/algorithms/lut.cpp