Patch Detail
Show a patch.
GET /api/1.1/patches/17668/?format=api
{ "id": 17668, "url": "https://patchwork.libcamera.org/api/1.1/patches/17668/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17668/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20221024000356.29521-6-laurent.pinchart@ideasonboard.com>", "date": "2022-10-24T00:03:48", "name": "[libcamera-devel,v3,05/13] ipa: rkisp1: agc: Support raw capture", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "a6ff4efd3d42e13c512ba576995c1517ec712c3c", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17668/mbox/", "series": [ { "id": 3574, "url": "https://patchwork.libcamera.org/api/1.1/series/3574/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3574", "date": "2022-10-24T00:03:43", "name": "Add Bayer format support for RkISP1", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3574/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17668/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17668/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 228DFBDB16\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 24 Oct 2022 00:04:34 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B28CD62EF6;\n\tMon, 24 Oct 2022 02:04:33 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9ED8562ED2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 24 Oct 2022 02:04:28 +0200 (CEST)", "from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2AC1B471;\n\tMon, 24 Oct 2022 02:04:28 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1666569873;\n\tbh=q4vlaDe9G9foCStqIT1WIl/viTRR4Z/iQiMqa/j9kDQ=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=rCfIUJsDQQmf1r+Rd1N97egH/R2zOqJuaa6H2XO+uyYr0ouMlPRU6RDEKxFZDZXI1\n\t0oVSlq7yPtgKdnnbHSBiQUUdvkYdAKJZPewp3UZv5WN8usc0kbAzTSe+IsNwcsqpyc\n\tZgGaGWqQ3ndDbu0qJDoNufXAUEsyWFg1fQ0GbtSvAnXaya5YsV48YAcEh9uaRxa4MC\n\tHU5cwgg7gkwklkUhccPALirJyilViGtdlyYwV9x8JgatkyHg7E58hYARP8Iz8hb5qr\n\tOVjXN1TO6v6OQu2q0yuQX3P0rwJMeA/8aGw2AzhVAUQnKFSBQkCdrkJOtnDALxILNS\n\tBSidV0fh7l+/Q==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1666569868;\n\tbh=q4vlaDe9G9foCStqIT1WIl/viTRR4Z/iQiMqa/j9kDQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Frr44n+alCuPJx1WCYYRZgEbkOnfGPLzeQvwPjdY6PnHTht/klXuZ2r16w0QM7cCt\n\tUvaGDoK+q+TicV+jTBD3nm3g2JuycV3a0Me0W3Muu3pg0mndoDZxUblbK6taQwpixL\n\trum17DgQ5+waLWGXfkRZ4H6FUIS4/AiWgqHP/Aro=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Frr44n+a\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 24 Oct 2022 03:03:48 +0300", "Message-Id": "<20221024000356.29521-6-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.37.4", "In-Reply-To": "<20221024000356.29521-1-laurent.pinchart@ideasonboard.com>", "References": "<20221024000356.29521-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 05/13] ipa: rkisp1: agc: Support raw\n\tcapture", "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>", "From": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Support raw capture by allowing manual control of the exposure time and\nanalogue gain.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/ipa/rkisp1/algorithms/agc.cpp | 51 ++++++++++++++++++++-----------\n src/ipa/rkisp1/algorithms/agc.h | 2 ++\n 2 files changed, 36 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/ipa/rkisp1/algorithms/agc.cpp b/src/ipa/rkisp1/algorithms/agc.cpp\nindex 377a3e8a0efd..973965babed2 100644\n--- a/src/ipa/rkisp1/algorithms/agc.cpp\n+++ b/src/ipa/rkisp1/algorithms/agc.cpp\n@@ -62,6 +62,7 @@ static constexpr double kRelativeLuminanceTarget = 0.4;\n Agc::Agc()\n \t: frameCount_(0), numCells_(0), numHistBins_(0), filteredExposure_(0s)\n {\n+\tsupportsRaw_ = true;\n }\n \n /**\n@@ -81,7 +82,7 @@ int Agc::configure(IPAContext &context, const IPACameraSensorInfo &configInfo)\n \t\t10ms / context.configuration.sensor.lineDuration;\n \tcontext.activeState.agc.manual.gain = context.activeState.agc.automatic.gain;\n \tcontext.activeState.agc.manual.exposure = context.activeState.agc.automatic.exposure;\n-\tcontext.activeState.agc.autoEnabled = true;\n+\tcontext.activeState.agc.autoEnabled = !context.configuration.raw;\n \n \t/*\n \t * According to the RkISP1 documentation:\n@@ -123,12 +124,14 @@ void Agc::queueRequest(IPAContext &context,\n {\n \tauto &agc = context.activeState.agc;\n \n-\tconst auto &agcEnable = controls.get(controls::AeEnable);\n-\tif (agcEnable && *agcEnable != agc.autoEnabled) {\n-\t\tagc.autoEnabled = *agcEnable;\n+\tif (!context.configuration.raw) {\n+\t\tconst auto &agcEnable = controls.get(controls::AeEnable);\n+\t\tif (agcEnable && *agcEnable != agc.autoEnabled) {\n+\t\t\tagc.autoEnabled = *agcEnable;\n \n-\t\tLOG(RkISP1Agc, Debug)\n-\t\t\t<< (*agcEnable ? \"Enabling\" : \"Disabling\") << \" AGC\";\n+\t\t\tLOG(RkISP1Agc, Debug)\n+\t\t\t\t<< (*agcEnable ? \"Enabling\" : \"Disabling\") << \" AGC\";\n+\t\t}\n \t}\n \n \tconst auto &exposure = controls.get(controls::ExposureTime);\n@@ -160,6 +163,9 @@ void Agc::queueRequest(IPAContext &context,\n void Agc::prepare(IPAContext &context, const uint32_t frame,\n \t\t IPAFrameContext &frameContext, rkisp1_params_cfg *params)\n {\n+\tif (!params)\n+\t\treturn;\n+\n \tif (frameContext.agc.autoEnabled) {\n \t\tframeContext.agc.exposure = context.activeState.agc.automatic.exposure;\n \t\tframeContext.agc.gain = context.activeState.agc.automatic.gain;\n@@ -367,6 +373,22 @@ double Agc::measureBrightness(const rkisp1_cif_isp_hist_stat *hist) const\n \treturn histogram.interQuantileMean(0.98, 1.0);\n }\n \n+void Agc::fillMetadata(IPAContext &context, IPAFrameContext &frameContext,\n+\t\t ControlList &metadata)\n+{\n+\tutils::Duration exposureTime = context.configuration.sensor.lineDuration\n+\t\t\t\t * frameContext.sensor.exposure;\n+\tmetadata.set(controls::AnalogueGain, frameContext.sensor.gain);\n+\tmetadata.set(controls::ExposureTime, exposureTime.get<std::micro>());\n+\n+\t/* \\todo Use VBlank value calculated from each frame exposure. */\n+\tuint32_t vTotal = context.configuration.sensor.size.height\n+\t\t\t+ context.configuration.sensor.defVBlank;\n+\tutils::Duration frameDuration = context.configuration.sensor.lineDuration\n+\t\t\t\t * vTotal;\n+\tmetadata.set(controls::FrameDuration, frameDuration.get<std::micro>());\n+}\n+\n /**\n * \\brief Process RkISP1 statistics, and run AGC operations\n * \\param[in] context The shared IPA context\n@@ -382,6 +404,11 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \t\t IPAFrameContext &frameContext, const rkisp1_stat_buffer *stats,\n \t\t ControlList &metadata)\n {\n+\tif (!stats) {\n+\t\tfillMetadata(context, frameContext, metadata);\n+\t\treturn;\n+\t}\n+\n \t/*\n \t * \\todo Verify that the exposure and gain applied by the sensor for\n \t * this frame match what has been requested. This isn't a hard\n@@ -424,17 +451,7 @@ void Agc::process(IPAContext &context, [[maybe_unused]] const uint32_t frame,\n \tcomputeExposure(context, frameContext, yGain, iqMeanGain);\n \tframeCount_++;\n \n-\tutils::Duration exposureTime = context.configuration.sensor.lineDuration\n-\t\t\t\t * frameContext.sensor.exposure;\n-\tmetadata.set(controls::AnalogueGain, frameContext.sensor.gain);\n-\tmetadata.set(controls::ExposureTime, exposureTime.get<std::micro>());\n-\n-\t/* \\todo Use VBlank value calculated from each frame exposure. */\n-\tuint32_t vTotal = context.configuration.sensor.size.height\n-\t\t\t+ context.configuration.sensor.defVBlank;\n-\tutils::Duration frameDuration = context.configuration.sensor.lineDuration\n-\t\t\t\t * vTotal;\n-\tmetadata.set(controls::FrameDuration, frameDuration.get<std::micro>());\n+\tfillMetadata(context, frameContext, metadata);\n }\n \n REGISTER_IPA_ALGORITHM(Agc, \"Agc\")\ndiff --git a/src/ipa/rkisp1/algorithms/agc.h b/src/ipa/rkisp1/algorithms/agc.h\nindex a228d0c37768..8a22263741b6 100644\n--- a/src/ipa/rkisp1/algorithms/agc.h\n+++ b/src/ipa/rkisp1/algorithms/agc.h\n@@ -44,6 +44,8 @@ private:\n \tutils::Duration filterExposure(utils::Duration exposureValue);\n \tdouble estimateLuminance(const rkisp1_cif_isp_ae_stat *ae, double gain);\n \tdouble measureBrightness(const rkisp1_cif_isp_hist_stat *hist) const;\n+\tvoid fillMetadata(IPAContext &context, IPAFrameContext &frameContext,\n+\t\t\t ControlList &metadata);\n \n \tuint64_t frameCount_;\n \n", "prefixes": [ "libcamera-devel", "v3", "05/13" ] }