[{"id":14254,"web_url":"https://patchwork.libcamera.org/comment/14254/","msgid":"<f35943be-b6c3-4055-639d-b2a49c67fab0@ideasonboard.com>","date":"2020-12-15T23:55:35","subject":"Re: [libcamera-devel] [PATCH 2/2] ipa: raspberrypi: Only validate\n\tISP and sensor control during configure","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Naush,\n\nAha, I thought I'd seen this before, so this is actaully a v2 from last\nweeks post?\n\nOn 15/12/2020 10:16, Naushir Patuck wrote:\n> There is no need to validate all the ISP and sensor V4L2 control on\n> every use. Simply validate them once during the IPA configuration, and\n> fail if a required control is not available.\n> \n\nI see this is updated for the latest IPA return and sensorCtrls naming.\n\nBut checking this once at configure time should be much more efficient.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> ---\n>  src/ipa/raspberrypi/raspberrypi.cpp | 133 ++++++++++++++--------------\n>  1 file changed, 66 insertions(+), 67 deletions(-)\n> \n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 5f2e07fd..bf544553 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -92,6 +92,8 @@ public:\n>  \n>  private:\n>  \tvoid setMode(const CameraSensorInfo &sensorInfo);\n> +\tbool validateSensorControls();\n> +\tbool validateIspControls();\n>  \tvoid queueRequest(const ControlList &controls);\n>  \tvoid returnEmbeddedBuffer(unsigned int bufferId);\n>  \tvoid prepareISP(unsigned int bufferId);\n> @@ -290,6 +292,18 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n>  \tsensorCtrls_ = entityControls.at(0);\n>  \tispCtrls_ = entityControls.at(1);\n>  \n> +\tif (!validateSensorControls()) {\n> +\t\tLOG(IPARPI, Error) << \"Sensor control validation failed.\";\n> +\t\tresult->operation = RPi::IPA_CONFIG_FAILED;\n> +\t\treturn;\n> +\t}\n> +\n> +\tif (!validateIspControls()) {\n> +\t\tLOG(IPARPI, Error) << \"ISP control validation failed.\";\n> +\t\tresult->operation = RPi::IPA_CONFIG_FAILED;\n> +\t\treturn;\n> +\t}\n> +\n>  \t/* Setup a metadata ControlList to output metadata. */\n>  \tlibcameraMetadata_ = ControlList(controls::controls);\n>  \n> @@ -506,6 +520,51 @@ void IPARPi::reportMetadata()\n>  \t}\n>  }\n>  \n> +bool IPARPi::validateSensorControls()\n> +{\n> +\tstatic const uint32_t ctrls[] = {\n> +\t\tV4L2_CID_ANALOGUE_GAIN,\n> +\t\tV4L2_CID_EXPOSURE\n> +\t};\n> +\n> +\tfor (auto c : ctrls) {\n> +\t\tif (sensorCtrls_.find(c) == sensorCtrls_.end()) {\n> +\t\t\tLOG(IPARPI, Error) << \"Unable to find Unicam control \"\n> +\t\t\t\t\t   << utils::hex(c);\n> +\t\t\treturn false;\n> +\t\t}\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n> +bool IPARPi::validateIspControls()\n> +{\n> +\tstatic const uint32_t ctrls[] = {\n> +\t\tV4L2_CID_RED_BALANCE,\n> +\t\tV4L2_CID_BLUE_BALANCE,\n> +\t\tV4L2_CID_DIGITAL_GAIN,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_CC_MATRIX,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_GAMMA,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_GEQ,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_DENOISE,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_SHARPEN,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_DPC,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_LENS_SHADING\n> +\t};\n> +\n> +\tfor (auto c : ctrls) {\n> +\t\tif (ispCtrls_.find(c) == ispCtrls_.end()) {\n> +\t\t\tLOG(IPARPI, Error) << \"Unable to find ISP control \"\n> +\t\t\t\t\t   << utils::hex(c);\n> +\t\t\treturn false;\n> +\t\t}\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n>  /*\n>   * Converting between enums (used in the libcamera API) and the names that\n>   * we use to identify different modes. Unfortunately, the conversion tables\n> @@ -891,18 +950,6 @@ void IPARPi::processStats(unsigned int bufferId)\n>  \n>  void IPARPi::applyAWB(const struct AwbStatus *awbStatus, ControlList &ctrls)\n>  {\n> -\tconst auto gainR = ispCtrls_.find(V4L2_CID_RED_BALANCE);\n> -\tif (gainR == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find red gain control\";\n> -\t\treturn;\n> -\t}\n> -\n> -\tconst auto gainB = ispCtrls_.find(V4L2_CID_BLUE_BALANCE);\n> -\tif (gainB == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find blue gain control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tLOG(IPARPI, Debug) << \"Applying WB R: \" << awbStatus->gain_r << \" B: \"\n>  \t\t\t   << awbStatus->gain_b;\n>  \n> @@ -917,16 +964,6 @@ void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls)\n>  \tint32_t gainCode = helper_->GainCode(agcStatus->analogue_gain);\n>  \tint32_t exposureLines = helper_->ExposureLines(agcStatus->shutter_time);\n>  \n> -\tif (sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN) == sensorCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find analogue gain control\";\n> -\t\treturn;\n> -\t}\n> -\n> -\tif (sensorCtrls_.find(V4L2_CID_EXPOSURE) == sensorCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find exposure control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tLOG(IPARPI, Debug) << \"Applying AGC Exposure: \" << agcStatus->shutter_time\n>  \t\t\t   << \" (Shutter lines: \" << exposureLines << \") Gain: \"\n>  \t\t\t   << agcStatus->analogue_gain << \" (Gain Code: \"\n> @@ -938,23 +975,14 @@ void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyDG(const struct AgcStatus *dgStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_DIGITAL_GAIN) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find digital gain control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tctrls.set(V4L2_CID_DIGITAL_GAIN,\n>  \t\t  static_cast<int32_t>(dgStatus->digital_gain * 1000));\n>  }\n>  \n>  void IPARPi::applyCCM(const struct CcmStatus *ccmStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_CC_MATRIX) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find CCM control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_custom_ccm ccm;\n> +\n>  \tfor (int i = 0; i < 9; i++) {\n>  \t\tccm.ccm.ccm[i / 3][i % 3].den = 1000;\n>  \t\tccm.ccm.ccm[i / 3][i % 3].num = 1000 * ccmStatus->matrix[i];\n> @@ -970,12 +998,8 @@ void IPARPi::applyCCM(const struct CcmStatus *ccmStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyGamma(const struct ContrastStatus *contrastStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_GAMMA) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find Gamma control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tstruct bcm2835_isp_gamma gamma;\n> +\n>  \tgamma.enabled = 1;\n>  \tfor (int i = 0; i < CONTRAST_NUM_POINTS; i++) {\n>  \t\tgamma.x[i] = contrastStatus->points[i].x;\n> @@ -989,12 +1013,8 @@ void IPARPi::applyGamma(const struct ContrastStatus *contrastStatus, ControlList\n>  \n>  void IPARPi::applyBlackLevel(const struct BlackLevelStatus *blackLevelStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find black level control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_black_level blackLevel;\n> +\n>  \tblackLevel.enabled = 1;\n>  \tblackLevel.black_level_r = blackLevelStatus->black_level_r;\n>  \tblackLevel.black_level_g = blackLevelStatus->black_level_g;\n> @@ -1007,12 +1027,8 @@ void IPARPi::applyBlackLevel(const struct BlackLevelStatus *blackLevelStatus, Co\n>  \n>  void IPARPi::applyGEQ(const struct GeqStatus *geqStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_GEQ) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find geq control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_geq geq;\n> +\n>  \tgeq.enabled = 1;\n>  \tgeq.offset = geqStatus->offset;\n>  \tgeq.slope.den = 1000;\n> @@ -1025,12 +1041,8 @@ void IPARPi::applyGEQ(const struct GeqStatus *geqStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyDenoise(const struct SdnStatus *denoiseStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_DENOISE) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find denoise control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_denoise denoise;\n> +\n>  \tdenoise.enabled = 1;\n>  \tdenoise.constant = denoiseStatus->noise_constant;\n>  \tdenoise.slope.num = 1000 * denoiseStatus->noise_slope;\n> @@ -1045,12 +1057,8 @@ void IPARPi::applyDenoise(const struct SdnStatus *denoiseStatus, ControlList &ct\n>  \n>  void IPARPi::applySharpen(const struct SharpenStatus *sharpenStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_SHARPEN) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find sharpen control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_sharpen sharpen;\n> +\n>  \tsharpen.enabled = 1;\n>  \tsharpen.threshold.num = 1000 * sharpenStatus->threshold;\n>  \tsharpen.threshold.den = 1000;\n> @@ -1066,12 +1074,8 @@ void IPARPi::applySharpen(const struct SharpenStatus *sharpenStatus, ControlList\n>  \n>  void IPARPi::applyDPC(const struct DpcStatus *dpcStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_DPC) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find DPC control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_dpc dpc;\n> +\n>  \tdpc.enabled = 1;\n>  \tdpc.strength = dpcStatus->strength;\n>  \n> @@ -1082,11 +1086,6 @@ void IPARPi::applyDPC(const struct DpcStatus *dpcStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_LENS_SHADING) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find LS control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \t/*\n>  \t * Program lens shading tables into pipeline.\n>  \t * Choose smallest cell size that won't exceed 63x48 cells.\n>","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 D4BEABD80A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 15 Dec 2020 23:55:41 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 45CDE61590;\n\tWed, 16 Dec 2020 00:55:41 +0100 (CET)","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 89BC460321\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 16 Dec 2020 00:55:38 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id EDC10593;\n\tWed, 16 Dec 2020 00:55:37 +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=\"a9dtLxBE\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1608076538;\n\tbh=psyMxgMy4Cef0l31hfkYCrbqoW6n/TW45ujKUj0I0Ns=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=a9dtLxBEzYu65uCGpUTW7BwBFdXjfUgEYcyjiUy0XGqgBRLgWjMt4gC2EdJr1JlJ1\n\tW5qql7jZl5qjVMC98JKZWQ5nnJzEZs/LkPNxtsf0TVfE32W6Y1Z1//8SBf5LCz+seL\n\t3TscgoLj8Z/1dG/05MFPb4FGE8TaaiNQktreBpug=","To":"Naushir Patuck <naush@raspberrypi.com>,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201215101633.21546-1-naush@raspberrypi.com>\n\t<20201215101633.21546-2-naush@raspberrypi.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<f35943be-b6c3-4055-639d-b2a49c67fab0@ideasonboard.com>","Date":"Tue, 15 Dec 2020 23:55:35 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201215101633.21546-2-naush@raspberrypi.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 2/2] ipa: raspberrypi: Only validate\n\tISP and sensor control during configure","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>","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}},{"id":14256,"web_url":"https://patchwork.libcamera.org/comment/14256/","msgid":"<X9lmKr3FzvB6gveL@pendragon.ideasonboard.com>","date":"2020-12-16T01:43:06","subject":"Re: [libcamera-devel] [PATCH 2/2] ipa: raspberrypi: Only validate\n\tISP and sensor control during configure","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Tue, Dec 15, 2020 at 10:16:33AM +0000, Naushir Patuck wrote:\n> There is no need to validate all the ISP and sensor V4L2 control on\n> every use. Simply validate them once during the IPA configuration, and\n> fail if a required control is not available.\n> \n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n> ---\n>  src/ipa/raspberrypi/raspberrypi.cpp | 133 ++++++++++++++--------------\n>  1 file changed, 66 insertions(+), 67 deletions(-)\n> \n> diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp\n> index 5f2e07fd..bf544553 100644\n> --- a/src/ipa/raspberrypi/raspberrypi.cpp\n> +++ b/src/ipa/raspberrypi/raspberrypi.cpp\n> @@ -92,6 +92,8 @@ public:\n>  \n>  private:\n>  \tvoid setMode(const CameraSensorInfo &sensorInfo);\n> +\tbool validateSensorControls();\n> +\tbool validateIspControls();\n>  \tvoid queueRequest(const ControlList &controls);\n>  \tvoid returnEmbeddedBuffer(unsigned int bufferId);\n>  \tvoid prepareISP(unsigned int bufferId);\n> @@ -290,6 +292,18 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,\n>  \tsensorCtrls_ = entityControls.at(0);\n>  \tispCtrls_ = entityControls.at(1);\n>  \n> +\tif (!validateSensorControls()) {\n> +\t\tLOG(IPARPI, Error) << \"Sensor control validation failed.\";\n> +\t\tresult->operation = RPi::IPA_CONFIG_FAILED;\n> +\t\treturn;\n> +\t}\n> +\n> +\tif (!validateIspControls()) {\n> +\t\tLOG(IPARPI, Error) << \"ISP control validation failed.\";\n> +\t\tresult->operation = RPi::IPA_CONFIG_FAILED;\n> +\t\treturn;\n> +\t}\n> +\n>  \t/* Setup a metadata ControlList to output metadata. */\n>  \tlibcameraMetadata_ = ControlList(controls::controls);\n>  \n> @@ -506,6 +520,51 @@ void IPARPi::reportMetadata()\n>  \t}\n>  }\n>  \n> +bool IPARPi::validateSensorControls()\n> +{\n> +\tstatic const uint32_t ctrls[] = {\n> +\t\tV4L2_CID_ANALOGUE_GAIN,\n> +\t\tV4L2_CID_EXPOSURE\n> +\t};\n> +\n> +\tfor (auto c : ctrls) {\n> +\t\tif (sensorCtrls_.find(c) == sensorCtrls_.end()) {\n> +\t\t\tLOG(IPARPI, Error) << \"Unable to find Unicam control \"\n\ns/Unicam/sensor/\n\nI'll fix when applying.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n> +\t\t\t\t\t   << utils::hex(c);\n> +\t\t\treturn false;\n> +\t\t}\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n> +bool IPARPi::validateIspControls()\n> +{\n> +\tstatic const uint32_t ctrls[] = {\n> +\t\tV4L2_CID_RED_BALANCE,\n> +\t\tV4L2_CID_BLUE_BALANCE,\n> +\t\tV4L2_CID_DIGITAL_GAIN,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_CC_MATRIX,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_GAMMA,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_GEQ,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_DENOISE,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_SHARPEN,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_DPC,\n> +\t\tV4L2_CID_USER_BCM2835_ISP_LENS_SHADING\n> +\t};\n> +\n> +\tfor (auto c : ctrls) {\n> +\t\tif (ispCtrls_.find(c) == ispCtrls_.end()) {\n> +\t\t\tLOG(IPARPI, Error) << \"Unable to find ISP control \"\n> +\t\t\t\t\t   << utils::hex(c);\n> +\t\t\treturn false;\n> +\t\t}\n> +\t}\n> +\n> +\treturn true;\n> +}\n> +\n>  /*\n>   * Converting between enums (used in the libcamera API) and the names that\n>   * we use to identify different modes. Unfortunately, the conversion tables\n> @@ -891,18 +950,6 @@ void IPARPi::processStats(unsigned int bufferId)\n>  \n>  void IPARPi::applyAWB(const struct AwbStatus *awbStatus, ControlList &ctrls)\n>  {\n> -\tconst auto gainR = ispCtrls_.find(V4L2_CID_RED_BALANCE);\n> -\tif (gainR == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find red gain control\";\n> -\t\treturn;\n> -\t}\n> -\n> -\tconst auto gainB = ispCtrls_.find(V4L2_CID_BLUE_BALANCE);\n> -\tif (gainB == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find blue gain control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tLOG(IPARPI, Debug) << \"Applying WB R: \" << awbStatus->gain_r << \" B: \"\n>  \t\t\t   << awbStatus->gain_b;\n>  \n> @@ -917,16 +964,6 @@ void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls)\n>  \tint32_t gainCode = helper_->GainCode(agcStatus->analogue_gain);\n>  \tint32_t exposureLines = helper_->ExposureLines(agcStatus->shutter_time);\n>  \n> -\tif (sensorCtrls_.find(V4L2_CID_ANALOGUE_GAIN) == sensorCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find analogue gain control\";\n> -\t\treturn;\n> -\t}\n> -\n> -\tif (sensorCtrls_.find(V4L2_CID_EXPOSURE) == sensorCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find exposure control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tLOG(IPARPI, Debug) << \"Applying AGC Exposure: \" << agcStatus->shutter_time\n>  \t\t\t   << \" (Shutter lines: \" << exposureLines << \") Gain: \"\n>  \t\t\t   << agcStatus->analogue_gain << \" (Gain Code: \"\n> @@ -938,23 +975,14 @@ void IPARPi::applyAGC(const struct AgcStatus *agcStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyDG(const struct AgcStatus *dgStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_DIGITAL_GAIN) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find digital gain control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tctrls.set(V4L2_CID_DIGITAL_GAIN,\n>  \t\t  static_cast<int32_t>(dgStatus->digital_gain * 1000));\n>  }\n>  \n>  void IPARPi::applyCCM(const struct CcmStatus *ccmStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_CC_MATRIX) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find CCM control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_custom_ccm ccm;\n> +\n>  \tfor (int i = 0; i < 9; i++) {\n>  \t\tccm.ccm.ccm[i / 3][i % 3].den = 1000;\n>  \t\tccm.ccm.ccm[i / 3][i % 3].num = 1000 * ccmStatus->matrix[i];\n> @@ -970,12 +998,8 @@ void IPARPi::applyCCM(const struct CcmStatus *ccmStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyGamma(const struct ContrastStatus *contrastStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_GAMMA) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find Gamma control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tstruct bcm2835_isp_gamma gamma;\n> +\n>  \tgamma.enabled = 1;\n>  \tfor (int i = 0; i < CONTRAST_NUM_POINTS; i++) {\n>  \t\tgamma.x[i] = contrastStatus->points[i].x;\n> @@ -989,12 +1013,8 @@ void IPARPi::applyGamma(const struct ContrastStatus *contrastStatus, ControlList\n>  \n>  void IPARPi::applyBlackLevel(const struct BlackLevelStatus *blackLevelStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_BLACK_LEVEL) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find black level control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_black_level blackLevel;\n> +\n>  \tblackLevel.enabled = 1;\n>  \tblackLevel.black_level_r = blackLevelStatus->black_level_r;\n>  \tblackLevel.black_level_g = blackLevelStatus->black_level_g;\n> @@ -1007,12 +1027,8 @@ void IPARPi::applyBlackLevel(const struct BlackLevelStatus *blackLevelStatus, Co\n>  \n>  void IPARPi::applyGEQ(const struct GeqStatus *geqStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_GEQ) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find geq control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_geq geq;\n> +\n>  \tgeq.enabled = 1;\n>  \tgeq.offset = geqStatus->offset;\n>  \tgeq.slope.den = 1000;\n> @@ -1025,12 +1041,8 @@ void IPARPi::applyGEQ(const struct GeqStatus *geqStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyDenoise(const struct SdnStatus *denoiseStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_DENOISE) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find denoise control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_denoise denoise;\n> +\n>  \tdenoise.enabled = 1;\n>  \tdenoise.constant = denoiseStatus->noise_constant;\n>  \tdenoise.slope.num = 1000 * denoiseStatus->noise_slope;\n> @@ -1045,12 +1057,8 @@ void IPARPi::applyDenoise(const struct SdnStatus *denoiseStatus, ControlList &ct\n>  \n>  void IPARPi::applySharpen(const struct SharpenStatus *sharpenStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_SHARPEN) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find sharpen control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_sharpen sharpen;\n> +\n>  \tsharpen.enabled = 1;\n>  \tsharpen.threshold.num = 1000 * sharpenStatus->threshold;\n>  \tsharpen.threshold.den = 1000;\n> @@ -1066,12 +1074,8 @@ void IPARPi::applySharpen(const struct SharpenStatus *sharpenStatus, ControlList\n>  \n>  void IPARPi::applyDPC(const struct DpcStatus *dpcStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_DPC) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find DPC control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \tbcm2835_isp_dpc dpc;\n> +\n>  \tdpc.enabled = 1;\n>  \tdpc.strength = dpcStatus->strength;\n>  \n> @@ -1082,11 +1086,6 @@ void IPARPi::applyDPC(const struct DpcStatus *dpcStatus, ControlList &ctrls)\n>  \n>  void IPARPi::applyLS(const struct AlscStatus *lsStatus, ControlList &ctrls)\n>  {\n> -\tif (ispCtrls_.find(V4L2_CID_USER_BCM2835_ISP_LENS_SHADING) == ispCtrls_.end()) {\n> -\t\tLOG(IPARPI, Error) << \"Can't find LS control\";\n> -\t\treturn;\n> -\t}\n> -\n>  \t/*\n>  \t * Program lens shading tables into pipeline.\n>  \t * Choose smallest cell size that won't exceed 63x48 cells.","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 D307BC0F1A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 16 Dec 2020 01:43:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3DF856158D;\n\tWed, 16 Dec 2020 02:43:14 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 16A796052A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 16 Dec 2020 02:43:13 +0100 (CET)","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 8FE5A3E;\n\tWed, 16 Dec 2020 02:43:12 +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=\"m7AWuTjU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1608082992;\n\tbh=kzaNgbLyhkVwGFJf40s8yUBhSoWaNmKwC/4yE93KI/4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=m7AWuTjUsapmo/ozGa4tO64ZGMyJFlQHDiem15aJbDamNXsYpqGuE6bHrFnF1Pnoo\n\tls68rAh/c1QU1GlZRjY02oLPO3/sJXqhzEEzTDrvpP6B/Z2vbPTmQTLpN9amP+vUiE\n\tMhslDuUmQ+zVRN7Od7MZ53bk/XFWLPr65V2AnUZA=","Date":"Wed, 16 Dec 2020 03:43:06 +0200","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"Naushir Patuck <naush@raspberrypi.com>","Message-ID":"<X9lmKr3FzvB6gveL@pendragon.ideasonboard.com>","References":"<20201215101633.21546-1-naush@raspberrypi.com>\n\t<20201215101633.21546-2-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201215101633.21546-2-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH 2/2] ipa: raspberrypi: Only validate\n\tISP and sensor control during configure","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>","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]