{"id":18177,"url":"https://patchwork.libcamera.org/api/1.1/patches/18177/?format=json","web_url":"https://patchwork.libcamera.org/patch/18177/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20230123154934.27803-3-naush@raspberrypi.com>","date":"2023-01-23T15:49:22","name":"[libcamera-devel,v2,02/14] pipeline: ipa: raspberrypi: Remove unused streamConfig","commit_ref":"d70c38dca8ea9b236e764106bad21ccc0a89b54c","pull_url":null,"state":"accepted","archived":false,"hash":"4eea982aa026fc064e93ddf256e5325ef349c01c","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/1.1/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/18177/mbox/","series":[{"id":3719,"url":"https://patchwork.libcamera.org/api/1.1/series/3719/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3719","date":"2023-01-23T15:49:20","name":"Raspberry Pi: Camera Module 3 support","version":2,"mbox":"https://patchwork.libcamera.org/series/3719/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/18177/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/18177/checks/","tags":{},"headers":{"Return-Path":"","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 071BEC3240\n\tfor ;\n\tMon, 23 Jan 2023 15:49:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0BC9F625F3;\n\tMon, 23 Jan 2023 16:49:52 +0100 (CET)","from mail-wm1-x336.google.com (mail-wm1-x336.google.com\n\t[IPv6:2a00:1450:4864:20::336])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EA1B2625E7\n\tfor ;\n\tMon, 23 Jan 2023 16:49:48 +0100 (CET)","by mail-wm1-x336.google.com with SMTP id g10so9380409wmo.1\n\tfor ;\n\tMon, 23 Jan 2023 07:49:48 -0800 (PST)","from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tn16-20020a05600c181000b003d1de805de5sm10339689wmp.16.2023.01.23.07.49.47\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 23 Jan 2023 07:49:48 -0800 (PST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1674488992;\n\tbh=VkG44ZZbKdX0I/UwM1bWgbMb/GHfQtEotZ7EzpVw5aI=;\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:Cc:\n\tFrom;\n\tb=GttkoAMCy7W2YHN7bTcHe7ExDO29A64GaDNvcRprZWL+c7h2nwSgRLETZ12tmA/4D\n\tetdp57ocnxmSqT/VzkStbyqlNZiYc3AN/jnHq+VpfqXajZpp5TGS3BwewgOdkdzBUo\n\tBW/5qA7UJ0yXyY5DJW3EPvJbVRDf5cPwX5TFKcEN+DAeejXx9rj3AI3n/TmmcIN1lL\n\tRuIs6KZXqURXRyrev+lTyjmocceY2qoPUjwAIAnHnnxKXdbT5A0QHkn0mUv0HwjGbB\n\ty+cYf3IhZALuDnDYOZE3k98+f8HSfzzU3nN0YnfPeog2CQMxBI+93GuGp47whaAnJi\n\tWuUMgN7uPWiXA==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=ln2wGHCJj71TM15zY2blAqeWIH4Mu4eKQ4MgaUd2zIQ=;\n\tb=WOpG6yTofxm0/FhvHYNbUAcsGUxQdBQp0Jxxvhz2+HiyWEU8+VH3CsJXgfXLqk1pkr\n\thiDC3fPdFTLDmkXGD6VxKbTr0nksqvNk06pE0vfzoXieuzjAB4qBS8YlGFuDvCaLxZOm\n\th8RqmUl3yzuXPyQcJewYQ7I91k69P3qmDg/t6kpMFoyHF31Y59+RSua2FChS/aiO0MrP\n\tLr1GPXBJIFQ8JCT+30cr/7SYB/JSiHpgCViVEnyXmsNEaTvpUVjm5d2endM2zxStshiG\n\t7N5c8YVOmaNh+tf9+oX9zKMht919rfJs4lHh17IV0LgCPDb00H6G797xYl7m2S03V4iP\n\toJiw=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"WOpG6yTo\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=ln2wGHCJj71TM15zY2blAqeWIH4Mu4eKQ4MgaUd2zIQ=;\n\tb=1kE8C8Aj/1RQkNftiyOrngRTsPWRsSd/uDXUexQAO7hH7dUbLisLbaiU7LCkGG6Qd1\n\tb/U6HmVUIP9x1guDxdN+hYi/EENUp84qOcxAnrUihypgfQjFv9KTYsp6jFaId3yRxYg8\n\tbdselN4Ep7Z0Wsw5WT5JxJtBxroQCDVFt+zncw8d31gt4EYnzPQpbl4pfnIIQenQG7nQ\n\tLrLk5w8tcjKdSJvVJsOsYUpOGk6+SDPOoMWyQDfgRxJGTeqAwMLpAnqknUwOE+XwxE5g\n\tLrAmZ+EHChudvJaZz03F4lrJZZzKMt7GYBmpvNeQ2Vk50tCdzPORB2l+wF0KcbVmppLW\n\tTzhw==","X-Gm-Message-State":"AFqh2kpWAZazBI7f3FkTgVrMxcKH/Be93an8/VubIpMi2Q+hziCUaB0J\n\tsJE+gsNTPe2kO41XtREjCEsRfwsgUrQumC/lWaY=","X-Google-Smtp-Source":"AMrXdXuOAc0TJqP3o/v+WAq85qct0G55ASdI+OQtLqv6lu8ZOy42MMMoK1qGk782Icc5H4HrxZ0kYQ==","X-Received":"by 2002:a7b:c5cb:0:b0:3d3:4f99:bb32 with SMTP id\n\tn11-20020a7bc5cb000000b003d34f99bb32mr23411157wmk.36.1674488988482; \n\tMon, 23 Jan 2023 07:49:48 -0800 (PST)","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 23 Jan 2023 15:49:22 +0000","Message-Id":"<20230123154934.27803-3-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20230123154934.27803-1-naush@raspberrypi.com>","References":"<20230123154934.27803-1-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 02/14] pipeline: ipa: raspberrypi:\n\tRemove unused streamConfig","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Cc":"Nick Hollinghurst ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Remove the streamConfig parameter from the ipa::configure() call, it is never\nused.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Nick Hollinghurst \nReviewed-by: David Plowman \n---\n include/libcamera/ipa/raspberrypi.mojom | 2 --\n src/ipa/raspberrypi/raspberrypi.cpp | 2 --\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 13 +------------\n 3 files changed, 1 insertion(+), 16 deletions(-)","diff":"diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom\nindex e7dabcbe5313..0732496968ed 100644\n--- a/include/libcamera/ipa/raspberrypi.mojom\n+++ b/include/libcamera/ipa/raspberrypi.mojom\n@@ -59,7 +59,6 @@ interface IPARPiInterface {\n \t * \\fn configure()\n \t * \\brief Configure the IPA stream and sensor settings\n \t * \\param[in] sensorInfo Camera sensor information\n-\t * \\param[in] streamConfig Configuration of all active streams\n \t * \\param[in] entityControls Controls provided by the pipeline entities\n \t * \\param[in] ipaConfig Pipeline-handler-specific configuration data\n \t * \\param[out] controls Controls to apply by the pipeline entity\n@@ -75,7 +74,6 @@ interface IPARPiInterface {\n \t * pipeline handler to the IPA and back.\n \t */\n \tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n-\t\t map streamConfig,\n \t\t map entityControls,\n \t\t IPAConfig ipaConfig)\n \t\t=> (int32 ret, libcamera.ControlList controls, IPAConfigResult result);\ndiff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\nindex ec18497155ba..f748b6e2dac7 100644\n--- a/src/ipa/raspberrypi/raspberrypi.cpp\n+++ b/src/ipa/raspberrypi/raspberrypi.cpp\n@@ -120,7 +120,6 @@ public:\n \tvoid stop() override {}\n \n \tint configure(const IPACameraSensorInfo &sensorInfo,\n-\t\t const std::map &streamConfig,\n \t\t const std::map &entityControls,\n \t\t const IPAConfig &data,\n \t\t ControlList *controls, IPAConfigResult *result) override;\n@@ -382,7 +381,6 @@ void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo)\n }\n \n int IPARPi::configure(const IPACameraSensorInfo &sensorInfo,\n-\t\t [[maybe_unused]] const std::map &streamConfig,\n \t\t const std::map &entityControls,\n \t\t const IPAConfig &ipaConfig,\n \t\t ControlList *controls, IPAConfigResult *result)\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 62417669bdc5..272767b5263b 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1612,20 +1612,9 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result)\n \n int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result)\n {\n-\tstd::map streamConfig;\n \tstd::map entityControls;\n \tipa::RPi::IPAConfig ipaConfig;\n \n-\t/* Inform IPA of stream configuration and sensor controls. */\n-\tunsigned int i = 0;\n-\tfor (auto const &stream : isp_) {\n-\t\tif (stream.isExternal()) {\n-\t\t\tstreamConfig[i++] = IPAStream(\n-\t\t\t\tstream.configuration().pixelFormat,\n-\t\t\t\tstream.configuration().size);\n-\t\t}\n-\t}\n-\n \tentityControls.emplace(0, sensor_->controls());\n \tentityControls.emplace(1, isp_[Isp::Input].dev()->controls());\n \n@@ -1655,7 +1644,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPA\n \n \t/* Ready the IPA - it must know about the sensor resolution. */\n \tControlList controls;\n-\tret = ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,\n+\tret = ipa_->configure(sensorInfo_, entityControls, ipaConfig,\n \t\t\t &controls, result);\n \tif (ret < 0) {\n \t\tLOG(RPI, Error) << \"IPA configuration failed!\";\n","prefixes":["libcamera-devel","v2","02/14"]}