[{"id":15188,"web_url":"https://patchwork.libcamera.org/comment/15188/","msgid":"<20210217084233.GB1786@pyrite.rasen.tech>","date":"2021-02-17T08:42:33","subject":"Re: [libcamera-devel] [PATCH 2/3] src: rkisp1: return error from\n\tipa's configure method if it fails","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Dafna,\n\nOn Tue, Feb 16, 2021 at 01:26:23PM +0100, Dafna Hirschfeld wrote:\n> The IPA of rkisp1 relay some of the camera's controls.\n> Therefore it can't work if those controls don't exist.\n> Return a negative int in that case.\n> Also return error from the 'configure' method of the pipeline\n> handler if the IPA configure fails.\n> \n> Signed-off-by: Dafna Hirschfeld \n\nLooks good to me.\n\nReviewed-by: Paul Elder \n\n> ---\n> include/libcamera/ipa/rkisp1.mojom | 2 +-\n> src/ipa/rkisp1/rkisp1.cpp | 11 ++++++-----\n> src/libcamera/pipeline/rkisp1/rkisp1.cpp | 7 +++++--\n> 3 files changed, 12 insertions(+), 8 deletions(-)\n> \n> diff --git a/include/libcamera/ipa/rkisp1.mojom b/include/libcamera/ipa/rkisp1.mojom\n> index 9270f9c7..95fa0d93 100644\n> --- a/include/libcamera/ipa/rkisp1.mojom\n> +++ b/include/libcamera/ipa/rkisp1.mojom\n> @@ -31,7 +31,7 @@ interface IPARkISP1Interface {\n> \n> \tconfigure(CameraSensorInfo sensorInfo,\n> \t\t map streamConfig,\n> -\t\t map entityControls) => ();\n> +\t\t map entityControls) => (int32 ret);\n> \n> \tmapBuffers(array buffers);\n> \tunmapBuffers(array ids);\n> diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\n> index 67bac986..b0641faf 100644\n> --- a/src/ipa/rkisp1/rkisp1.cpp\n> +++ b/src/ipa/rkisp1/rkisp1.cpp\n> @@ -38,7 +38,7 @@ public:\n> \tint start() override { return 0; }\n> \tvoid stop() override {}\n> \n> -\tvoid configure(const CameraSensorInfo &info,\n> +\tint configure(const CameraSensorInfo &info,\n> \t\t const std::map &streamConfig,\n> \t\t const std::map &entityControls) override;\n> \tvoid mapBuffers(const std::vector &buffers) override;\n> @@ -75,25 +75,25 @@ private:\n> * assemble one. Make sure the reported sensor information are relevant\n> * before accessing them.\n> */\n> -void IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> +int IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> \t\t\t [[maybe_unused]] const std::map &streamConfig,\n> \t\t\t const std::map &entityControls)\n> {\n> \tif (entityControls.empty())\n> -\t\treturn;\n> +\t\treturn -1;\n> \n> \tctrls_ = entityControls.at(0);\n> \n> \tconst auto itExp = ctrls_.find(V4L2_CID_EXPOSURE);\n> \tif (itExp == ctrls_.end()) {\n> \t\tLOG(IPARkISP1, Error) << \"Can't find exposure control\";\n> -\t\treturn;\n> +\t\treturn -1;\n> \t}\n> \n> \tconst auto itGain = ctrls_.find(V4L2_CID_ANALOGUE_GAIN);\n> \tif (itGain == ctrls_.end()) {\n> \t\tLOG(IPARkISP1, Error) << \"Can't find gain control\";\n> -\t\treturn;\n> +\t\treturn -1;\n> \t}\n> \n> \tautoExposure_ = true;\n> @@ -111,6 +111,7 @@ void IPARkISP1::configure([[maybe_unused]] const CameraSensorInfo &info,\n> \t\t<< \" Gain: \" << minGain_ << \"-\" << maxGain_;\n> \n> \tsetControls(0);\n> +\treturn 0;\n> }\n> \n> void IPARkISP1::mapBuffers(const std::vector &buffers)\n> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> index 1dd878fc..dad8e5d4 100644\n> --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n> @@ -653,8 +653,11 @@ int PipelineHandlerRkISP1::configure(Camera *camera, CameraConfiguration *c)\n> \tstd::map entityControls;\n> \tentityControls.emplace(0, data->sensor_->controls());\n> \n> -\tdata->ipa_->configure(sensorInfo, streamConfig, entityControls);\n> -\n> +\tret = data->ipa_->configure(sensorInfo, streamConfig, entityControls);\n> +\tif (ret) {\n> +\t\tLOG(RkISP1, Error) << \"failed configuring IPA (\" << ret << \")\";\n> +\t\treturn ret;\n> +\t}\n> \treturn 0;\n> }\n> \n> -- \n> 2.17.1\n>","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 1ADA9BD1F1\n\tfor ;\n\tWed, 17 Feb 2021 08:42:44 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 46923637F5;\n\tWed, 17 Feb 2021 09:42:43 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 639AD602FA\n\tfor ;\n\tWed, 17 Feb 2021 09:42:42 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E426B8C4;\n\tWed, 17 Feb 2021 09:42:38 +0100 (CET)"],"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=\"OJmt4EmY\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1613551362;\n\tbh=Ak3uSs7mq6bdBKmNdl2LjLL8v+QMQ2ikyVKIkImkLks=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=OJmt4EmYwdDloKLY09U5uH+l3eNLCi8Mn4UPVwix62ipxhBCRU3L3EwIafq+L8uM3\n\tYx/1yzzy7fcNBXGs1uoaDHP3Q5D+F0WnWgOHulXV8b++K6b7lvmAPVmM+3/SwGPcQs\n\tJuR2+P/D856X/F1PZPi5oYZoDtVSHoUNgoquCQuc=","Date":"Wed, 17 Feb 2021 17:42:33 +0900","From":"paul.elder@ideasonboard.com","To":"Dafna Hirschfeld ","Message-ID":"<20210217084233.GB1786@pyrite.rasen.tech>","References":"<20210216122624.27940-1-dafna.hirschfeld@collabora.com>\n\t<20210216122624.27940-3-dafna.hirschfeld@collabora.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210216122624.27940-3-dafna.hirschfeld@collabora.com>","Subject":"Re: [libcamera-devel] [PATCH 2/3] src: rkisp1: return error from\n\tipa's configure method if it fails","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","Cc":"libcamera-devel@lists.libcamera.org, kernel@collabora.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]