Patch Detail
Show a patch.
GET /api/patches/21162/?format=api
{ "id": 21162, "url": "https://patchwork.libcamera.org/api/patches/21162/?format=api", "web_url": "https://patchwork.libcamera.org/patch/21162/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20240904074500.106019-3-mzamazal@redhat.com>", "date": "2024-09-04T07:44:59", "name": "[2/2] libcamera: software_isp: Add contrast control", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "53a8871472802fab0dc9c961adecea2485bf6f19", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/21162/mbox/", "series": [ { "id": 4561, "url": "https://patchwork.libcamera.org/api/series/4561/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4561", "date": "2024-09-04T07:44:57", "name": "Add contrast control to software ISP", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4561/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/21162/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/21162/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "X-Original-To": "parsemail@patchwork.libcamera.org", "Delivered-To": "parsemail@patchwork.libcamera.org", "Received": [ "from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9C54FC3259\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 4 Sep 2024 07:45:19 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 09E34634E8;\n\tWed, 4 Sep 2024 09:45:18 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id DEC35634E0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 4 Sep 2024 09:45:15 +0200 (CEST)", "from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-672-FvTbrNpZPayo4M4PvdZV8g-1;\n\tWed, 04 Sep 2024 03:45:13 -0400", "from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com\n\t[10.30.177.15])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 86BB51953956 for <libcamera-devel@lists.libcamera.org>;\n\tWed, 4 Sep 2024 07:45:12 +0000 (UTC)", "from nuthatch.redhat.com (unknown [10.45.225.152])\n\tby mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 68CD41956086; Wed, 4 Sep 2024 07:45:11 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"FLb8WV6X\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1725435914;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=DB6a3dkmx0CJJGhia06QHcCu9v3Uh2fcKoQn/pYQ2EU=;\n\tb=FLb8WV6XItf4s66nUxe89gbHFlE7KMEIFDl3HaYf6SiZJbatJ7p9wJ4BkOfLP0Jj8EedCN\n\tfQq9MoHvaEp2dHcO6YGBvrILjpNMZ1Hkp4TRl3M2TZO3wcmrYgIntifLq3xw9/30Lt+1Sh\n\tfRaLzIZR0CY0bqs7H7qLtFyt/OulIfA=", "X-MC-Unique": "FvTbrNpZPayo4M4PvdZV8g-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH 2/2] libcamera: software_isp: Add contrast control", "Date": "Wed, 4 Sep 2024 09:44:59 +0200", "Message-ID": "<20240904074500.106019-3-mzamazal@redhat.com>", "In-Reply-To": "<20240904074500.106019-1-mzamazal@redhat.com>", "References": "<20240904074500.106019-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.0 on 127.0.0.2", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This patch introduces support for applying runtime controls to software\nISP. It enables the contrast algorithm as the first control that can be\nused.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n .../libcamera/internal/software_isp/software_isp.h | 3 ++-\n include/libcamera/ipa/soft.mojom | 2 +-\n src/ipa/simple/data/uncalibrated.yaml | 1 +\n src/ipa/simple/soft_simple.cpp | 13 +++++++++++--\n src/libcamera/pipeline/simple/simple.cpp | 2 +-\n src/libcamera/software_isp/software_isp.cpp | 8 ++++++--\n 6 files changed, 22 insertions(+), 7 deletions(-)", "diff": "diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex a3e3a9da..d51b03fd 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -46,7 +46,8 @@ LOG_DECLARE_CATEGORY(SoftwareIsp)\n class SoftwareIsp\n {\n public:\n-\tSoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor);\n+\tSoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n+\t\t ControlInfoMap *ipaControls);\n \t~SoftwareIsp();\n \n \tint loadConfiguration([[maybe_unused]] const std::string &filename) { return 0; }\ndiff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\nindex bc70d4e4..3b8a72a2 100644\n--- a/include/libcamera/ipa/soft.mojom\n+++ b/include/libcamera/ipa/soft.mojom\n@@ -17,7 +17,7 @@ interface IPASoftInterface {\n \t libcamera.SharedFD fdStats,\n \t libcamera.SharedFD fdParams,\n \t libcamera.ControlInfoMap sensorCtrlInfoMap)\n-\t\t=> (int32 ret);\n+\t\t=> (int32 ret, libcamera.ControlInfoMap ipaControls);\n \tstart() => (int32 ret);\n \tstop();\n \tconfigure(IPAConfigInfo configInfo)\ndiff --git a/src/ipa/simple/data/uncalibrated.yaml b/src/ipa/simple/data/uncalibrated.yaml\nindex 324f98f4..2ed24e8c 100644\n--- a/src/ipa/simple/data/uncalibrated.yaml\n+++ b/src/ipa/simple/data/uncalibrated.yaml\n@@ -4,6 +4,7 @@\n version: 1\n algorithms:\n - BlackLevel:\n+ - Contrast:\n - Gamma:\n - Awb:\n - Lut:\ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex ac7a22b7..d6c7ff7f 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -34,6 +34,10 @@ LOG_DEFINE_CATEGORY(IPASoft)\n \n namespace ipa::soft {\n \n+const ControlInfoMap::Map swispControls{\n+\t{ &controls::Contrast, ControlInfo(0.0f, 10.0f, 1.0f) },\n+};\n+\n /* Maximum number of frame contexts to be held */\n static constexpr uint32_t kMaxFrameContexts = 16;\n \n@@ -50,7 +54,8 @@ public:\n \tint init(const IPASettings &settings,\n \t\t const SharedFD &fdStats,\n \t\t const SharedFD &fdParams,\n-\t\t const ControlInfoMap &sensorInfoMap) override;\n+\t\t const ControlInfoMap &sensorInfoMap,\n+\t\t ControlInfoMap *ipaControls) override;\n \tint configure(const IPAConfigInfo &configInfo) override;\n \n \tint start() override;\n@@ -87,7 +92,8 @@ IPASoftSimple::~IPASoftSimple()\n int IPASoftSimple::init(const IPASettings &settings,\n \t\t\tconst SharedFD &fdStats,\n \t\t\tconst SharedFD &fdParams,\n-\t\t\tconst ControlInfoMap &sensorInfoMap)\n+\t\t\tconst ControlInfoMap &sensorInfoMap,\n+\t\t\tControlInfoMap *ipaControls)\n {\n \tcamHelper_ = CameraSensorHelperFactoryBase::create(settings.sensorModel);\n \tif (!camHelper_) {\n@@ -158,6 +164,9 @@ int IPASoftSimple::init(const IPASettings &settings,\n \t\tstats_ = static_cast<SwIspStats *>(mem);\n \t}\n \n+\tControlInfoMap::Map ctrlMap = swispControls;\n+\t*ipaControls = ControlInfoMap(std::move(ctrlMap), controls::controls);\n+\n \t/*\n \t * Check if the sensor driver supports the controls required by the\n \t * Soft IPA.\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex fc80e665..86c4447e 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -531,7 +531,7 @@ int SimpleCameraData::init()\n \t * Instantiate Soft ISP if this is enabled for the given driver and no converter is used.\n \t */\n \tif (!converter_ && pipe->swIspEnabled()) {\n-\t\tswIsp_ = std::make_unique<SoftwareIsp>(pipe, sensor_.get());\n+\t\tswIsp_ = std::make_unique<SoftwareIsp>(pipe, sensor_.get(), &controlInfo_);\n \t\tif (!swIsp_->isValid()) {\n \t\t\tLOG(SimplePipeline, Warning)\n \t\t\t\t<< \"Failed to create software ISP, disabling software debayering\";\ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex dbf27f31..78b78bab 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -13,6 +13,7 @@\n #include <sys/types.h>\n #include <unistd.h>\n \n+#include <libcamera/controls.h>\n #include <libcamera/formats.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n@@ -61,9 +62,11 @@ LOG_DEFINE_CATEGORY(SoftwareIsp)\n * \\brief Constructs SoftwareIsp object\n * \\param[in] pipe The pipeline handler in use\n * \\param[in] sensor Pointer to the CameraSensor instance owned by the pipeline\n+ * \\param[out] ipaControls The IPA controls to update\n * handler\n */\n-SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor)\n+SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,\n+\t\t\t ControlInfoMap *ipaControls)\n \t: dmaHeap_(DmaBufAllocator::DmaBufAllocatorFlag::CmaHeap |\n \t\t DmaBufAllocator::DmaBufAllocatorFlag::SystemHeap |\n \t\t DmaBufAllocator::DmaBufAllocatorFlag::UDmaBuf)\n@@ -125,7 +128,8 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor)\n \tint ret = ipa_->init(IPASettings{ ipaTuningFile, sensor->model() },\n \t\t\t debayer_->getStatsFD(),\n \t\t\t sharedParams_.fd(),\n-\t\t\t sensor->controls());\n+\t\t\t sensor->controls(),\n+\t\t\t ipaControls);\n \tif (ret) {\n \t\tLOG(SoftwareIsp, Error) << \"IPA init failed\";\n \t\tdebayer_.reset();\n", "prefixes": [ "2/2" ] }