summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Klug <stefan.klug@ideasonboard.com>2024-06-13 10:33:19 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2024-06-13 14:01:54 +0300
commitc2fad17ad083defede63d41b8b698f388f016fff (patch)
tree8a3aab227a4568d69aaa2c44c0fef7e8e7b9ade6
parent9b84d75cb101d129e00ff9696ccd329eb8a4c461 (diff)
ipa: rkisp1: cproc: Merge identical functions
convertContrast() and convertSaturation() are equal. Merge them into one. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-rw-r--r--src/ipa/rkisp1/algorithms/cproc.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/ipa/rkisp1/algorithms/cproc.cpp b/src/ipa/rkisp1/algorithms/cproc.cpp
index 95529809..9f400a52 100644
--- a/src/ipa/rkisp1/algorithms/cproc.cpp
+++ b/src/ipa/rkisp1/algorithms/cproc.cpp
@@ -44,12 +44,7 @@ int convertBrightness(const float v)
return std::clamp<int>(std::lround(v * 128), -128, 127);
}
-int convertContrast(const float v)
-{
- return std::clamp<int>(std::lround(v * 128), 0, 255);
-}
-
-int convertSaturation(const float v)
+int convertContrastOrSaturation(const float v)
{
return std::clamp<int>(std::lround(v * 128), 0, 255);
}
@@ -80,8 +75,8 @@ int ColorProcessing::configure([[maybe_unused]] IPAContext &context,
auto &cproc = context.activeState.cproc;
cproc.brightness = convertBrightness(kDefaultBrightness);
- cproc.contrast = convertContrast(kDefaultContrast);
- cproc.saturation = convertSaturation(kDefaultSaturation);
+ cproc.contrast = convertContrastOrSaturation(kDefaultContrast);
+ cproc.saturation = convertContrastOrSaturation(kDefaultSaturation);
return 0;
}
@@ -113,7 +108,7 @@ void ColorProcessing::queueRequest(IPAContext &context,
const auto &contrast = controls.get(controls::Contrast);
if (contrast) {
- int value = convertContrast(*contrast);
+ int value = convertContrastOrSaturation(*contrast);
if (cproc.contrast != value) {
cproc.contrast = value;
update = true;
@@ -124,7 +119,7 @@ void ColorProcessing::queueRequest(IPAContext &context,
const auto saturation = controls.get(controls::Saturation);
if (saturation) {
- int value = convertSaturation(*saturation);
+ int value = convertContrastOrSaturation(*saturation);
if (cproc.saturation != value) {
cproc.saturation = value;
update = true;