[{"id":14847,"web_url":"https://patchwork.libcamera.org/comment/14847/","msgid":"<20210129085337.sbfd5szwt3fjvzhr@uno.localdomain>","date":"2021-01-29T08:53:37","subject":"Re: [libcamera-devel] [PATCH v3 2/5] libcamera: camera_sensor: Add\n\tframe length limits to CameraSensorInfo","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Naush\n\nOn Thu, Jan 28, 2021 at 09:10:47AM +0000, Naushir Patuck wrote:\n> Sensor frame length is made up of active and inactive (blanking) lines.\n> The minimum and maximum frame length values may be used by pipeline\n> handlers to limit frame durations based on the sensor mode capabilities.\n>\n> Store the minimum and maximum allowable frame length values (in lines)\n> in the CameraSensorInfo structure. These values are computed in\n> CameraSensor::sensorInfo() by querying the sensor subdevice\n> V4L2_CID_VBLANK control limits. This in turn means that V4L2_CID_VBLANK\n> is now a mandatory subdevice control.\n>\n> Signed-off-by: Naushir Patuck <naush@raspberrypi.com>\n\nI like this!\n\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\nThanks\n  j\n\n> ---\n>  include/libcamera/internal/camera_sensor.h |  3 ++\n>  src/libcamera/camera_sensor.cpp            | 43 ++++++++++++++++++++--\n>  test/ipa/ipa_wrappers_test.cpp             |  2 +\n>  3 files changed, 44 insertions(+), 4 deletions(-)\n>\n> diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h\n> index fed36bf26e47..5d8c9b1a3121 100644\n> --- a/include/libcamera/internal/camera_sensor.h\n> +++ b/include/libcamera/internal/camera_sensor.h\n> @@ -33,6 +33,9 @@ struct CameraSensorInfo {\n>\n>  \tuint64_t pixelRate;\n>  \tuint32_t lineLength;\n> +\n> +\tuint32_t minFrameLength;\n> +\tuint32_t maxFrameLength;\n>  };\n>\n>  class CameraSensor : protected Loggable\n> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp\n> index ab315bdc468c..f60d0cc9c6fa 100644\n> --- a/src/libcamera/camera_sensor.cpp\n> +++ b/src/libcamera/camera_sensor.cpp\n> @@ -113,6 +113,36 @@ LOG_DEFINE_CATEGORY(CameraSensor)\n>   * The total line length in pixel clock periods, including blanking.\n>   */\n>\n> +/**\n> + * \\var CameraSensorInfo::minFrameLength\n> + * \\brief The minimum allowable frame length in units of lines\n> + *\n> + * The sensor frame length comprises of active output lines and blanking lines\n> + * in a frame. The minimum frame length value dictates the minimum allowable\n> + * frame duration of the sensor mode.\n> + *\n> + * To obtain the minimum frame duration:\n> + *\n> + * \\verbatim\n> +\tframeDuration(s) = minFrameLength(lines) * lineLength(pixels) / pixelRate(pixels per second)\n> +   \\endverbatim\n> + */\n> +\n> +/**\n> + * \\var CameraSensorInfo::maxFrameLength\n> + * \\brief The maximum allowable frame length in units of lines\n> + *\n> + * The sensor frame length comprises of active output lines and blanking lines\n> + * in a frame. The maximum frame length value dictates the maximum allowable\n> + * frame duration of the sensor mode.\n> + *\n> + * To obtain the maximum frame duration:\n> + *\n> + * \\verbatim\n> +\tframeDuration(s) = maxFrameLength(lines) * lineLength(pixels) / pixelRate(pixels per second)\n> +   \\endverbatim\n> + */\n> +\n>  /**\n>   * \\class CameraSensor\n>   * \\brief A camera sensor based on V4L2 subdevices\n> @@ -699,12 +729,13 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n>  \tinfo->outputSize = format.size;\n>\n>  \t/*\n> -\t * Retrieve the pixel rate and the line length through V4L2 controls.\n> -\t * Support for the V4L2_CID_PIXEL_RATE and V4L2_CID_HBLANK controls is\n> -\t * mandatory.\n> +\t * Retrieve the pixel rate, line length and minimum/maximum frame\n> +\t * duration through V4L2 controls. Support for the V4L2_CID_PIXEL_RATE,\n> +\t * V4L2_CID_HBLANK and V4L2_CID_VBLANK controls is mandatory.\n>  \t */\n>  \tControlList ctrls = subdev_->getControls({ V4L2_CID_PIXEL_RATE,\n> -\t\t\t\t\t\t   V4L2_CID_HBLANK });\n> +\t\t\t\t\t\t   V4L2_CID_HBLANK,\n> +\t\t\t\t\t\t   V4L2_CID_VBLANK });\n>  \tif (ctrls.empty()) {\n>  \t\tLOG(CameraSensor, Error)\n>  \t\t\t<< \"Failed to retrieve camera info controls\";\n> @@ -715,6 +746,10 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const\n>  \tinfo->lineLength = info->outputSize.width + hblank;\n>  \tinfo->pixelRate = ctrls.get(V4L2_CID_PIXEL_RATE).get<int64_t>();\n>\n> +\tconst ControlInfo vblank = ctrls.infoMap()->at(V4L2_CID_VBLANK);\n> +\tinfo->minFrameLength = info->outputSize.height + vblank.min().get<int32_t>();\n> +\tinfo->maxFrameLength = info->outputSize.height + vblank.max().get<int32_t>();\n> +\n>  \treturn 0;\n>  }\n>\n> diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp\n> index 47533d105d03..eb6d783e8489 100644\n> --- a/test/ipa/ipa_wrappers_test.cpp\n> +++ b/test/ipa/ipa_wrappers_test.cpp\n> @@ -313,6 +313,8 @@ protected:\n>  \t\t\t.outputSize = { 2560, 1940 },\n>  \t\t\t.pixelRate = 96000000,\n>  \t\t\t.lineLength = 2918,\n> +\t\t\t.minFrameLength = 1940,\n> +\t\t\t.maxFrameLength = 2880\n>  \t\t};\n>  \t\tstd::map<unsigned int, IPAStream> config{\n>  \t\t\t{ 1, { V4L2_PIX_FMT_YUYV, { 1024, 768 } } },\n> --\n> 2.25.1\n>\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 E2061C33BB\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 29 Jan 2021 08:53:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7BD5E68393;\n\tFri, 29 Jan 2021 09:53:19 +0100 (CET)","from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2C05A682F2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 29 Jan 2021 09:53:18 +0100 (CET)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 879D12001F;\n\tFri, 29 Jan 2021 08:53:16 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Fri, 29 Jan 2021 09:53:37 +0100","From":"Jacopo Mondi <jacopo@jmondi.org>","To":"Naushir Patuck <naush@raspberrypi.com>","Message-ID":"<20210129085337.sbfd5szwt3fjvzhr@uno.localdomain>","References":"<20210128091050.881815-1-naush@raspberrypi.com>\n\t<20210128091050.881815-3-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210128091050.881815-3-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH v3 2/5] libcamera: camera_sensor: Add\n\tframe length limits to CameraSensorInfo","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>"}}]