{"id":13216,"url":"https://patchwork.libcamera.org/api/patches/13216/?format=json","web_url":"https://patchwork.libcamera.org/patch/13216/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210805170147.20050-1-laurent.pinchart@ideasonboard.com>","date":"2021-08-05T17:01:47","name":"[libcamera-devel] ipa: vimc: Add configure() function","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"1fef9317191ccd86c4e2845af6199341b9844c26","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13216/mbox/","series":[{"id":2310,"url":"https://patchwork.libcamera.org/api/series/2310/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2310","date":"2021-08-05T17:01:47","name":"[libcamera-devel] ipa: vimc: Add configure() function","version":1,"mbox":"https://patchwork.libcamera.org/series/2310/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13216/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13216/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 CB329C3237\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu,  5 Aug 2021 17:02:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 1FB1368811;\n\tThu,  5 Aug 2021 19:02:05 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E39776026D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu,  5 Aug 2021 19:02:03 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5BED3E04;\n\tThu,  5 Aug 2021 19:02:03 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"H7F2mXoZ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628182923;\n\tbh=PF74wVMjU9cGzXogwQXVKzLBhT5hFFquNex4WXOhwMk=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=H7F2mXoZBBnwSOSPgyLPrRDyhF+a4SUuSs24Jeb0QHgWeEzO57/o+ua7vYOwJBibT\n\tE/JIpKvoj/7rp/k4zmOeS+O+8kXtNElplpXPl8hiQGWahdYcvWGSsSgbWm5wIMJfyd\n\tshsvPt22eJDJ95JyMA9u+lUdGM2PYyIOJdch9vuY=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Thu,  5 Aug 2021 20:01:47 +0300","Message-Id":"<20210805170147.20050-1-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.31.1","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH] ipa: vimc: Add configure() function","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":"As part of an effort to make the vimc IPA usable for testing, extend it\nwith a configure function. The configuration is currently ignored by the\nIPA.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\nUmang, I've had this in my tree for some time, if it helps the work\nyou're doing on testing buffer mapping in vimc, please feel free to use\nthis patch (as-is, or squashed into anything else).\n---\n include/libcamera/ipa/vimc.mojom     |  5 +++++\n src/ipa/vimc/vimc.cpp                | 11 +++++++++++\n src/libcamera/pipeline/vimc/vimc.cpp | 16 ++++++++++++++++\n 3 files changed, 32 insertions(+)","diff":"diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex 86bc318a878e..85d25e27ebcd 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -19,6 +19,11 @@ enum IPAOperationCode {\n \n interface IPAVimcInterface {\n \tinit(libcamera.IPASettings settings) => (int32 ret);\n+\n+\tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n+\t\t  map<uint32, libcamera.IPAStream> streamConfig,\n+\t\t  map<uint32, libcamera.ControlInfoMap> entityControls) => ();\n+\n \tstart() => (int32 ret);\n \tstop();\n };\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 0c0ee006fdc7..5da5c6c09d68 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -34,6 +34,10 @@ public:\n \tint start() override;\n \tvoid stop() override;\n \n+\tvoid configure(const IPACameraSensorInfo &sensorInfo,\n+\t\t       const std::map<unsigned int, IPAStream> &streamConfig,\n+\t\t       const std::map<unsigned int, ControlInfoMap> &entityControls) override;\n+\n private:\n \tvoid initTrace();\n \tvoid trace(enum ipa::vimc::IPAOperationCode operation);\n@@ -86,6 +90,13 @@ void IPAVimc::stop()\n \tLOG(IPAVimc, Debug) << \"stop vimc IPA!\";\n }\n \n+void IPAVimc::configure([[maybe_unused]] const IPACameraSensorInfo &sensorInfo,\n+\t\t\t[[maybe_unused]] const std::map<unsigned int, IPAStream> &streamConfig,\n+\t\t\t[[maybe_unused]] const std::map<unsigned int, ControlInfoMap> &entityControls)\n+{\n+\tLOG(IPAVimc, Debug) << \"configure()\";\n+}\n+\n void IPAVimc::initTrace()\n {\n \tstruct stat fifoStat;\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 12f7517fd0ae..b7dd6595d608 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -295,6 +295,22 @@ int PipelineHandlerVimc::configure(Camera *camera, CameraConfiguration *config)\n \n \tcfg.setStream(&data->stream_);\n \n+\tif (data->ipa_) {\n+\t\t/* Inform IPA of stream configuration and sensor controls. */\n+\t\tstd::map<unsigned int, IPAStream> streamConfig;\n+\t\tstreamConfig.emplace(std::piecewise_construct,\n+\t\t\t\t     std::forward_as_tuple(0),\n+\t\t\t\t     std::forward_as_tuple(cfg.pixelFormat, cfg.size));\n+\n+\t\tstd::map<unsigned int, ControlInfoMap> entityControls;\n+\t\tentityControls.emplace(0, data->sensor_->controls());\n+\n+\t\tIPACameraSensorInfo sensorInfo;\n+\t\tdata->sensor_->sensorInfo(&sensorInfo);\n+\n+\t\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls);\n+\t}\n+\n \treturn 0;\n }\n \n","prefixes":["libcamera-devel"]}