[{"id":16606,"web_url":"https://patchwork.libcamera.org/comment/16606/","msgid":"","date":"2021-04-27T03:56:19","subject":"Re: [libcamera-devel] [PATCH v2 5/7] libcamera: CameraSensor:\n\tAttach available test pattern modes","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Wed, Apr 21, 2021 at 01:23:44PM +0900, Hirokazu Honda wrote:\n> This add available test pattern modes to libcamera to\n> CameraSensorInfo.\n> \n> Signed-off-by: Hirokazu Honda \n> ---\n> include/libcamera/internal/camera_sensor.h | 2 ++\n> src/libcamera/camera_sensor.cpp | 38 ++++++++++++++++++++++\n> 2 files changed, 40 insertions(+)\n> \n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index 3fa3a419..75b884db 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -38,6 +38,8 @@ struct CameraSensorInfo {\n> \n> \tuint32_t minFrameLength;\n> \tuint32_t maxFrameLength;\n> +\n> +\tstd::vector availableTestPatternModes;\n> };\n> \n> class CameraSensor : protected Loggable\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index 850c94b3..d20cfb4c 100644\n> --- a/src/libcamera/camera_sensor.cpp\n> +++ b/src/libcamera/camera_sensor.cpp\n> @@ -840,6 +840,44 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n> \tinfo->minFrameLength = info->outputSize.height + vblank.min().get();\n> \tinfo->maxFrameLength = info->outputSize.height + vblank.max().get();\n> \n> +\tconst SensorInfo *staticInfo = SensorDatabase::get(model_);\n> +\tif (!staticInfo) {\n> +\t\tLOG(CameraSensor, Warning)\n> +\t\t\t<< \"No static properties available for '\" << model_ << \"'\";\n> +\t\tLOG(CameraSensor, Warning)\n> +\t\t\t<< \"Please consider updating the sensor database\";\n> +\t\treturn -EINVAL;\n> +\t}\n> +\n> +\tconst auto &v4l2TestPattern = controls().find(V4L2_CID_TEST_PATTERN);\n> +\tif (v4l2TestPattern == controls().end()) {\n> +\t\tLOG(CameraSensor, Debug) << \"No static test pattern map for \\'\"\n> +\t\t\t\t\t << model() << \"\\'\";\n> +\t\treturn 0;\n> +\t}\n> +\n> +\tfor (const ControlValue &value : v4l2TestPattern->second.values()) {\n> +\t\tconst ControlMenu &menu = value.get();\n> +\t\tASSERT(menu.isName);\n> +\n> +\t\tint32_t matchedTestPattern = -1;\n> +\t\tfor (const auto &[name, testPattern] : staticInfo->testPatternModeMap) {\n> +\t\t\tif (strcmp(menu.name, name) == 0) {\n> +\t\t\t\tmatchedTestPattern = testPattern;\n> +\t\t\t\tbreak;\n> +\t\t\t}\n> +\t\t}\n> +\n> +\t\tif (matchedTestPattern != -1) {\n> +\t\t\tLOG(CameraSensor, Debug) << \"Test pattern mode named \\'\"\n> +\t\t\t\t\t\t << menu.name << \"\\' added\";\n> +\t\t\tinfo->availableTestPatternModes.push_back(matchedTestPattern);\n> +\t\t} else {\n> +\t\t\tLOG(CameraSensor, Debug) << \"Test pattern mode named \\'\"\n> +\t\t\t\t\t\t << menu.name << \"\\' ignored\";\n> +\t\t}\n> +\t}\n\nThis shouldn't be done every time sensorInfo() is called, but once at\ninitialization time, and cached.\n\n> +\n> \treturn 0;\n> }\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 DE04CBDCA1\n\tfor ;\n\tTue, 27 Apr 2021 03:56:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9501B688AF;\n\tTue, 27 Apr 2021 05:56:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 46CBD68866\n\tfor ;\n\tTue, 27 Apr 2021 05:56:26 +0200 (CEST)","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 9333645E;\n\tTue, 27 Apr 2021 05:56:25 +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=\"AgQ43DSt\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619495785;\n\tbh=4tRPxDVMjCpCaEbUNw+RN+BKcxCcNzrIKS6j005qqdQ=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=AgQ43DStMF03JROY9+0CQsNPugIU5p1Zi0WvDJOHfgm8E9XZtiv3YCWO1Iiwzt2a1\n\t0j4snPXkrMQDwtOhZ1ufuIbD4+brWlrPihFOz7NT/e04EgqN+UrBnjg1jp17xtTp8o\n\tkhrucW7zGpxG4rsMxwuWnBG0isj1YJnvQQfLqIVo=","Date":"Tue, 27 Apr 2021 06:56:19 +0300","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20210421042346.312854-1-hiroh@chromium.org>\n\t<20210421042346.312854-6-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210421042346.312854-6-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v2 5/7] libcamera: CameraSensor:\n\tAttach available test pattern modes","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]