From patchwork Mon Jan 23 15:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 18177 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 071BEC3240 for ; Mon, 23 Jan 2023 15:49:53 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0BC9F625F3; Mon, 23 Jan 2023 16:49:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1674488992; bh=VkG44ZZbKdX0I/UwM1bWgbMb/GHfQtEotZ7EzpVw5aI=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc: From; b=GttkoAMCy7W2YHN7bTcHe7ExDO29A64GaDNvcRprZWL+c7h2nwSgRLETZ12tmA/4D etdp57ocnxmSqT/VzkStbyqlNZiYc3AN/jnHq+VpfqXajZpp5TGS3BwewgOdkdzBUo BW/5qA7UJ0yXyY5DJW3EPvJbVRDf5cPwX5TFKcEN+DAeejXx9rj3AI3n/TmmcIN1lL RuIs6KZXqURXRyrev+lTyjmocceY2qoPUjwAIAnHnnxKXdbT5A0QHkn0mUv0HwjGbB y+cYf3IhZALuDnDYOZE3k98+f8HSfzzU3nN0YnfPeog2CQMxBI+93GuGp47whaAnJi WuUMgN7uPWiXA== Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EA1B2625E7 for ; Mon, 23 Jan 2023 16:49:48 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="WOpG6yTo"; dkim-atps=neutral Received: by mail-wm1-x336.google.com with SMTP id g10so9380409wmo.1 for ; Mon, 23 Jan 2023 07:49:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; 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=ln2wGHCJj71TM15zY2blAqeWIH4Mu4eKQ4MgaUd2zIQ=; b=WOpG6yTofxm0/FhvHYNbUAcsGUxQdBQp0Jxxvhz2+HiyWEU8+VH3CsJXgfXLqk1pkr hiDC3fPdFTLDmkXGD6VxKbTr0nksqvNk06pE0vfzoXieuzjAB4qBS8YlGFuDvCaLxZOm h8RqmUl3yzuXPyQcJewYQ7I91k69P3qmDg/t6kpMFoyHF31Y59+RSua2FChS/aiO0MrP Lr1GPXBJIFQ8JCT+30cr/7SYB/JSiHpgCViVEnyXmsNEaTvpUVjm5d2endM2zxStshiG 7N5c8YVOmaNh+tf9+oX9zKMht919rfJs4lHh17IV0LgCPDb00H6G797xYl7m2S03V4iP oJiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=ln2wGHCJj71TM15zY2blAqeWIH4Mu4eKQ4MgaUd2zIQ=; b=1kE8C8Aj/1RQkNftiyOrngRTsPWRsSd/uDXUexQAO7hH7dUbLisLbaiU7LCkGG6Qd1 b/U6HmVUIP9x1guDxdN+hYi/EENUp84qOcxAnrUihypgfQjFv9KTYsp6jFaId3yRxYg8 bdselN4Ep7Z0Wsw5WT5JxJtBxroQCDVFt+zncw8d31gt4EYnzPQpbl4pfnIIQenQG7nQ LrLk5w8tcjKdSJvVJsOsYUpOGk6+SDPOoMWyQDfgRxJGTeqAwMLpAnqknUwOE+XwxE5g LrAmZ+EHChudvJaZz03F4lrJZZzKMt7GYBmpvNeQ2Vk50tCdzPORB2l+wF0KcbVmppLW Tzhw== X-Gm-Message-State: AFqh2kpWAZazBI7f3FkTgVrMxcKH/Be93an8/VubIpMi2Q+hziCUaB0J sJE+gsNTPe2kO41XtREjCEsRfwsgUrQumC/lWaY= X-Google-Smtp-Source: AMrXdXuOAc0TJqP3o/v+WAq85qct0G55ASdI+OQtLqv6lu8ZOy42MMMoK1qGk782Icc5H4HrxZ0kYQ== X-Received: by 2002:a7b:c5cb:0:b0:3d3:4f99:bb32 with SMTP id n11-20020a7bc5cb000000b003d34f99bb32mr23411157wmk.36.1674488988482; Mon, 23 Jan 2023 07:49:48 -0800 (PST) Received: from localhost.localdomain ([93.93.133.154]) by smtp.gmail.com with ESMTPSA id n16-20020a05600c181000b003d1de805de5sm10339689wmp.16.2023.01.23.07.49.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 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 Subject: [libcamera-devel] [PATCH v2 02/14] pipeline: ipa: raspberrypi: Remove unused streamConfig 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 Cc: Nick Hollinghurst Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Remove the streamConfig parameter from the ipa::configure() call, it is never used. Signed-off-by: Naushir Patuck Reviewed-by: Nick Hollinghurst Reviewed-by: David Plowman --- include/libcamera/ipa/raspberrypi.mojom | 2 -- src/ipa/raspberrypi/raspberrypi.cpp | 2 -- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 13 +------------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom index e7dabcbe5313..0732496968ed 100644 --- a/include/libcamera/ipa/raspberrypi.mojom +++ b/include/libcamera/ipa/raspberrypi.mojom @@ -59,7 +59,6 @@ interface IPARPiInterface { * \fn configure() * \brief Configure the IPA stream and sensor settings * \param[in] sensorInfo Camera sensor information - * \param[in] streamConfig Configuration of all active streams * \param[in] entityControls Controls provided by the pipeline entities * \param[in] ipaConfig Pipeline-handler-specific configuration data * \param[out] controls Controls to apply by the pipeline entity @@ -75,7 +74,6 @@ interface IPARPiInterface { * pipeline handler to the IPA and back. */ configure(libcamera.IPACameraSensorInfo sensorInfo, - map streamConfig, map entityControls, IPAConfig ipaConfig) => (int32 ret, libcamera.ControlList controls, IPAConfigResult result); diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index ec18497155ba..f748b6e2dac7 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -120,7 +120,6 @@ public: void stop() override {} int configure(const IPACameraSensorInfo &sensorInfo, - const std::map &streamConfig, const std::map &entityControls, const IPAConfig &data, ControlList *controls, IPAConfigResult *result) override; @@ -382,7 +381,6 @@ void IPARPi::setMode(const IPACameraSensorInfo &sensorInfo) } int IPARPi::configure(const IPACameraSensorInfo &sensorInfo, - [[maybe_unused]] const std::map &streamConfig, const std::map &entityControls, const IPAConfig &ipaConfig, ControlList *controls, IPAConfigResult *result) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 62417669bdc5..272767b5263b 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1612,20 +1612,9 @@ int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result) int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result) { - std::map streamConfig; std::map entityControls; ipa::RPi::IPAConfig ipaConfig; - /* Inform IPA of stream configuration and sensor controls. */ - unsigned int i = 0; - for (auto const &stream : isp_) { - if (stream.isExternal()) { - streamConfig[i++] = IPAStream( - stream.configuration().pixelFormat, - stream.configuration().size); - } - } - entityControls.emplace(0, sensor_->controls()); entityControls.emplace(1, isp_[Isp::Input].dev()->controls()); @@ -1655,7 +1644,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPA /* Ready the IPA - it must know about the sensor resolution. */ ControlList controls; - ret = ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig, + ret = ipa_->configure(sensorInfo_, entityControls, ipaConfig, &controls, result); if (ret < 0) { LOG(RPI, Error) << "IPA configuration failed!";