From c2fad17ad083defede63d41b8b698f388f016fff Mon Sep 17 00:00:00 2001 From: Stefan Klug Date: Thu, 13 Jun 2024 10:33:19 +0200 Subject: ipa: rkisp1: cproc: Merge identical functions convertContrast() and convertSaturation() are equal. Merge them into one. Signed-off-by: Stefan Klug Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/ipa/rkisp1/algorithms/cproc.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/ipa/rkisp1/algorithms') 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(std::lround(v * 128), -128, 127); } -int convertContrast(const float v) -{ - return std::clamp(std::lround(v * 128), 0, 255); -} - -int convertSaturation(const float v) +int convertContrastOrSaturation(const float v) { return std::clamp(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; -- cgit v1.2.1