From patchwork Wed Mar 22 13:06:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18433 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 5B29DC0F1B for ; Wed, 22 Mar 2023 13:06:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BA2E762724; Wed, 22 Mar 2023 14:06:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1679490389; bh=9A/rwptP+p9jk3E0TaYU1mMV8Yim4LEVhI7SIMYQAvA=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Q3iLK/oLXkjQ2e8AVm8dEq7at38NzgnzFAYSsCOAnE3epxGzvPW6ZWaZIn26TX1NC tUiZKXThZpjEhpL+SxVVT3Po9M4/bxWmf+0y+CL4CXkhAg6/1udi2lDEU7+vFsiyT5 9hnRKiCLY9LWrEWV61ZCQ791HHute5/CUm+ACtKbJP5VkWbHJnfNP6v+iYVlVSp9hb HY17XyxMHNZlLqYvAE0lBarm5ntcpUyEtzDIHmaZJoCx06oAIAXsM6ZRpunjyhXhug xxdom8Fgg7rpnRXxcaEO+OLXVlXcOXJ3IZhgKvVjRE04/NeBaAYO/QbTLVJ9ZcQeWC KSz0Q3Ub+lzBw== Received: from mail-il1-x132.google.com (mail-il1-x132.google.com [IPv6:2607:f8b0:4864:20::132]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7040E62716 for ; Wed, 22 Mar 2023 14:06:25 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="JYsPqXNI"; dkim-atps=neutral Received: by mail-il1-x132.google.com with SMTP id j6so9804706ilr.7 for ; Wed, 22 Mar 2023 06:06:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; t=1679490384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yoxd2YPF+mGleci8HMNu54DMJ+86Zo6lhHkuT0jgQAk=; b=JYsPqXNIpAGYp99P9jBi9Vnf1yKSII4hZyJ4yedHgFFCVk9Wn9soVCXdZafSxgNhIQ OaPGaBmpKlt6bmL9qLpGCRhtOOO7rSPqv4ycaksAgWTvY3cESUzTLy3H8KRgIyi3GAQk A0yHL2eUUAILOQdczfWtnrOoAQYZwVk385jJpb2wTo+3ix2310e0//9Z/opq+btCOBRQ vz6hJ1NBp41/CmfoMTVNqYgNc/py1wtiplyauQjIiZbg1pn/dlSe9nSJbOiZ6qq3YAGc NQM2FncyiukrqpKSetwfTsrKoS7Zi6HWIUXRRJIOUHwaj2HcWD08h4GweaQfo4rVekis ILnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679490384; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yoxd2YPF+mGleci8HMNu54DMJ+86Zo6lhHkuT0jgQAk=; b=hOPm51RIehbSGVcjwyL1EzIQ3SuqoZcpxIDW1eTMaSJV16PXChvXQiu2fesTYgIq9C kzhGz3FfnB8ByQVquOF1BNFOSq6rheZDw7CFmPSGrPvurVCvonlQUgQgyMn4EHM97x1G 0ULpPUy19ykexe/EMe/QseLPm5hbzLzo3huROpAclywvR804PaZE1fcoBZZnUCUN4h5Y JAz4UzJXLakIufXsyHZfIyz2YCCmxPmfTDqt7VD+q9FmAgRpkbbYE2G3/mR3RkUnbnPo ASwogL6rWzOAXCnUMT4gYDL3W3uCUE9MzP5yvbpSJwGFizBUmswehsilsNiNwLFhOmNY 8+QA== X-Gm-Message-State: AO0yUKXR/WHAwVgnY7pegHSPgTw80mqgLZKBxSQSTvT9UNJ/6ZB77VSQ Hmb5JuW7qtzesd7g6RIamG8QlYbK/ZFA/RkPe+TtRQ== X-Google-Smtp-Source: AK7set/oen4OaDsZ/oc9QFKjKAFDFYcSXXjiDCiYv7GOMSZenutodUrV1V6g43K9bGdewMWha4sduw== X-Received: by 2002:a92:dac9:0:b0:325:bc3f:f757 with SMTP id o9-20020a92dac9000000b00325bc3ff757mr1588557ilq.0.1679490383992; Wed, 22 Mar 2023 06:06:23 -0700 (PDT) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id l6-20020a026646000000b003c488204c6fsm4927960jaf.76.2023.03.22.06.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Mar 2023 06:06:23 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Wed, 22 Mar 2023 13:06:08 +0000 Message-Id: <20230322130612.5208-7-naush@raspberrypi.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230322130612.5208-1-naush@raspberrypi.com> References: <20230322130612.5208-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v1 06/10] ipa: raspberrypi: Generalise the contrast algorithm X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Generalise the contrast algorithm code by removing any hard-coded assumptions about the target hardware platform. Instead, the algorithm code creates a generic Pwl that gets returned to the IPA, where it gets converted to the bcm2835 hardware specific lookup table. As a drive-by, remove an unused mutex. Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Reviewed-by: Jacopo Mondi --- .../raspberrypi/controller/contrast_status.h | 11 ++----- .../raspberrypi/controller/rpi/contrast.cpp | 30 ++++--------------- src/ipa/raspberrypi/controller/rpi/contrast.h | 1 - src/ipa/raspberrypi/raspberrypi.cpp | 15 +++++++--- 4 files changed, 20 insertions(+), 37 deletions(-) diff --git a/src/ipa/raspberrypi/controller/contrast_status.h b/src/ipa/raspberrypi/controller/contrast_status.h index ef2a7c680fc2..fb9fe4bace71 100644 --- a/src/ipa/raspberrypi/controller/contrast_status.h +++ b/src/ipa/raspberrypi/controller/contrast_status.h @@ -6,20 +6,15 @@ */ #pragma once +#include "pwl.h" + /* * The "contrast" algorithm creates a gamma curve, optionally doing a little bit * of contrast stretching based on the AGC histogram. */ -constexpr unsigned int ContrastNumPoints = 33; - -struct ContrastPoint { - uint16_t x; - uint16_t y; -}; - struct ContrastStatus { - struct ContrastPoint points[ContrastNumPoints]; + RPiController::Pwl gammaCurve; double brightness; double contrast; }; diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp index a4f8c4f04fc4..bee1eadd3657 100644 --- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp +++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp @@ -65,34 +65,19 @@ void Contrast::setContrast(double contrast) contrast_ = contrast; } -static void fillInStatus(ContrastStatus &status, double brightness, - double contrast, Pwl &gammaCurve) -{ - status.brightness = brightness; - status.contrast = contrast; - for (unsigned int i = 0; i < ContrastNumPoints - 1; i++) { - int x = i < 16 ? i * 1024 - : (i < 24 ? (i - 16) * 2048 + 16384 - : (i - 24) * 4096 + 32768); - status.points[i].x = x; - status.points[i].y = std::min(65535.0, gammaCurve.eval(x)); - } - status.points[ContrastNumPoints - 1].x = 65535; - status.points[ContrastNumPoints - 1].y = 65535; -} - void Contrast::initialise() { /* * Fill in some default values as Prepare will run before Process gets * called. */ - fillInStatus(status_, brightness_, contrast_, config_.gammaCurve); + status_.brightness = brightness_; + status_.contrast = contrast_; + status_.gammaCurve = config_.gammaCurve; } void Contrast::prepare(Metadata *imageMetadata) { - std::unique_lock lock(mutex_); imageMetadata->set("contrast.status", status_); } @@ -183,12 +168,9 @@ void Contrast::process(StatisticsPtr &stats, * And fill in the status for output. Use more points towards the bottom * of the curve. */ - ContrastStatus status; - fillInStatus(status, brightness_, contrast_, gammaCurve); - { - std::unique_lock lock(mutex_); - status_ = status; - } + status_.brightness = brightness_; + status_.contrast = contrast_; + status_.gammaCurve = std::move(gammaCurve); } /* Register algorithm with the system. */ diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.h b/src/ipa/raspberrypi/controller/rpi/contrast.h index c68adbc9e463..9c81277a0450 100644 --- a/src/ipa/raspberrypi/controller/rpi/contrast.h +++ b/src/ipa/raspberrypi/controller/rpi/contrast.h @@ -46,7 +46,6 @@ private: double brightness_; double contrast_; ContrastStatus status_; - std::mutex mutex_; }; } /* namespace RPiController */ diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 0fa79bb4af41..b6e5465ca32a 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -1592,14 +1592,21 @@ void IPARPi::applyCCM(const struct CcmStatus *ccmStatus, ControlList &ctrls) void IPARPi::applyGamma(const struct ContrastStatus *contrastStatus, ControlList &ctrls) { + const unsigned int numGammaPoints = controller_.getHardwareConfig().numGammaPoints; struct bcm2835_isp_gamma gamma; - gamma.enabled = 1; - for (unsigned int i = 0; i < ContrastNumPoints; i++) { - gamma.x[i] = contrastStatus->points[i].x; - gamma.y[i] = contrastStatus->points[i].y; + for (unsigned int i = 0; i < numGammaPoints - 1; i++) { + int x = i < 16 ? i * 1024 + : (i < 24 ? (i - 16) * 2048 + 16384 + : (i - 24) * 4096 + 32768); + gamma.x[i] = x; + gamma.y[i] = std::min(65535, contrastStatus->gammaCurve.eval(x)); } + gamma.x[numGammaPoints - 1] = 65535; + gamma.y[numGammaPoints - 1] = 65535; + gamma.enabled = 1; + ControlValue c(Span{ reinterpret_cast(&gamma), sizeof(gamma) }); ctrls.set(V4L2_CID_USER_BCM2835_ISP_GAMMA, c);