NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

ipa: rkisp1: cproc: Merge identical functions

Browse source 
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>
This commit is contained in:
Stefan Klug 2024-06-13 10:33:19 +02:00 • committed by Laurent Pinchart
parent 9b84d75cb1
commit c2fad17ad0
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/ipa/rkisp1/algorithms/cproc.cpp
View file

@ -44,12 +44,7 @@ int convertBrightness(const float v)
return std::clamp<int>(std::lround(v * 128), -128, 127); return std::clamp<int>(std::lround(v * 128), -128, 127);
} }
int convertContrast(const float v) int convertContrastOrSaturation(const float v)
{
return std::clamp<int>(std::lround(v * 128), 0, 255);
}
int convertSaturation(const float v)
{ {
return std::clamp<int>(std::lround(v * 128), 0, 255); 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; auto &cproc = context.activeState.cproc;
cproc.brightness = convertBrightness(kDefaultBrightness); cproc.brightness = convertBrightness(kDefaultBrightness);
cproc.contrast = convertContrast(kDefaultContrast); cproc.contrast = convertContrastOrSaturation(kDefaultContrast);
cproc.saturation = convertSaturation(kDefaultSaturation); cproc.saturation = convertContrastOrSaturation(kDefaultSaturation);
return 0; return 0;
} }
@ -113,7 +108,7 @@ void ColorProcessing::queueRequest(IPAContext &context,
const auto &contrast = controls.get(controls::Contrast); const auto &contrast = controls.get(controls::Contrast);
if (contrast) { if (contrast) {
int value = convertContrast(*contrast); int value = convertContrastOrSaturation(*contrast);
if (cproc.contrast != value) { if (cproc.contrast != value) {
cproc.contrast = value; cproc.contrast = value;
update = true; update = true;
@ -124,7 +119,7 @@ void ColorProcessing::queueRequest(IPAContext &context,
const auto saturation = controls.get(controls::Saturation); const auto saturation = controls.get(controls::Saturation);
if (saturation) { if (saturation) {
int value = convertSaturation(*saturation); int value = convertContrastOrSaturation(*saturation);
if (cproc.saturation != value) { if (cproc.saturation != value) {
cproc.saturation = value; cproc.saturation = value;
update = true; update = true;