[{"id":1692,"web_url":"https://patchwork.libcamera.org/comment/1692/","msgid":"<20190524064227.tpcwx2aeeeehdog3@uno.localdomain>","date":"2019-05-24T06:42:27","subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: v4l2_device: Add\n\ttryFormat support","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Kieran,\n\nOn Thu, May 23, 2019 at 02:58:58PM +0100, Kieran Bingham wrote:\n> Extend the internal functionality of setFormat{Single,Multi}plane to\n> allow 'trying' a format. This provides the facility of checking a format\n> with the driver before committing to it.\n>\n\nRegardless of the format enumeration that Niklas' working on, I think\nhaving a try format API is still a worthwile change.\n\nPatch looks fine\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> Signed-off-by: Kieran Bingham \n> ---\n> src/libcamera/include/v4l2_device.h | 7 +++++--\n> src/libcamera/v4l2_device.cpp | 29 +++++++++++++++++++++++------\n> 2 files changed, 28 insertions(+), 8 deletions(-)\n>\n> diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\n> index 2e7bd1e7f4cc..a08615c3bd9a 100644\n> --- a/src/libcamera/include/v4l2_device.h\n> +++ b/src/libcamera/include/v4l2_device.h\n> @@ -126,6 +126,7 @@ public:\n>\n> \tint getFormat(V4L2DeviceFormat *format);\n> \tint setFormat(V4L2DeviceFormat *format);\n> +\tint tryFormat(V4L2DeviceFormat *format);\n>\n> \tint exportBuffers(BufferPool *pool);\n> \tint importBuffers(BufferPool *pool);\n> @@ -145,10 +146,12 @@ protected:\n>\n> private:\n> \tint getFormatSingleplane(V4L2DeviceFormat *format);\n> -\tint setFormatSingleplane(V4L2DeviceFormat *format);\n> +\tint trySetFormatSingleplane(V4L2DeviceFormat *format,\n> +\t\t\t\t unsigned long request);\n>\n> \tint getFormatMultiplane(V4L2DeviceFormat *format);\n> -\tint setFormatMultiplane(V4L2DeviceFormat *format);\n> +\tint trySetFormatMultiplane(V4L2DeviceFormat *format,\n> +\t\t\t\t unsigned long request);\n>\n> \tint requestBuffers(unsigned int count);\n> \tint createPlane(Buffer *buffer, unsigned int plane,\n> diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\n> index 8366ffc4db55..2cdbc2696e55 100644\n> --- a/src/libcamera/v4l2_device.cpp\n> +++ b/src/libcamera/v4l2_device.cpp\n> @@ -434,8 +434,23 @@ int V4L2Device::getFormat(V4L2DeviceFormat *format)\n> */\n> int V4L2Device::setFormat(V4L2DeviceFormat *format)\n> {\n> -\treturn caps_.isMultiplanar() ? setFormatMultiplane(format) :\n> -\t\t\t\t setFormatSingleplane(format);\n> +\treturn caps_.isMultiplanar() ? trySetFormatMultiplane(format, VIDIOC_S_FMT) :\n> +\t\t\t\t trySetFormatSingleplane(format, VIDIOC_S_FMT);\n> +}\n> +\n> +/**\n> + * \\brief Validate an image format on the V4L2 device\n> + * \\param[inout] format The image format to apply to the device\n> + *\n> + * Try the supplied \\a format on the device, and return the format parameters\n> + * that would have been applied, as \\ref V4L2Device::setFormat would do.\n> + *\n> + * \\return 0 on success or a negative error code otherwise\n> + */\n> +int V4L2Device::tryFormat(V4L2DeviceFormat *format)\n> +{\n> +\treturn caps_.isMultiplanar() ? trySetFormatMultiplane(format, VIDIOC_TRY_FMT) :\n> +\t\t\t\t trySetFormatSingleplane(format, VIDIOC_TRY_FMT);\n> }\n>\n> int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)\n> @@ -462,7 +477,8 @@ int V4L2Device::getFormatSingleplane(V4L2DeviceFormat *format)\n> \treturn 0;\n> }\n>\n> -int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)\n> +int V4L2Device::trySetFormatSingleplane(V4L2DeviceFormat *format,\n> +\t\t\t\t\tunsigned long request)\n> {\n> \tstruct v4l2_format v4l2Format = {};\n> \tstruct v4l2_pix_format *pix = &v4l2Format.fmt.pix;\n> @@ -475,7 +491,7 @@ int V4L2Device::setFormatSingleplane(V4L2DeviceFormat *format)\n> \tpix->bytesperline = format->planes[0].bpl;\n> \tpix->field = V4L2_FIELD_NONE;\n>\n> -\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);\n> +\tret = ioctl(fd_, request, &v4l2Format);\n> \tif (ret) {\n> \t\tret = -errno;\n> \t\tLOG(V4L2, Error) << \"Unable to set format: \" << strerror(-ret);\n> @@ -523,7 +539,8 @@ int V4L2Device::getFormatMultiplane(V4L2DeviceFormat *format)\n> \treturn 0;\n> }\n>\n> -int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *format)\n> +int V4L2Device::trySetFormatMultiplane(V4L2DeviceFormat *format,\n> +\t\t\t\t unsigned long request)\n> {\n> \tstruct v4l2_format v4l2Format = {};\n> \tstruct v4l2_pix_format_mplane *pix = &v4l2Format.fmt.pix_mp;\n> @@ -541,7 +558,7 @@ int V4L2Device::setFormatMultiplane(V4L2DeviceFormat *format)\n> \t\tpix->plane_fmt[i].sizeimage = format->planes[i].size;\n> \t}\n>\n> -\tret = ioctl(fd_, VIDIOC_S_FMT, &v4l2Format);\n> +\tret = ioctl(fd_, request, &v4l2Format);\n> \tif (ret) {\n> \t\tret = -errno;\n> \t\tLOG(V4L2, Error) << \"Unable to set format: \" << strerror(-ret);\n> --\n> 2.20.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":"","Received":["from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8895F60BFD\n\tfor ;\n\tFri, 24 May 2019 08:41:20 +0200 (CEST)","from uno.localdomain (2-224-242-101.ip172.fastwebnet.it\n\t[2.224.242.101]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 0F53140008;\n\tFri, 24 May 2019 06:41:19 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","Date":"Fri, 24 May 2019 08:42:27 +0200","From":"Jacopo Mondi ","To":"Kieran Bingham ","Cc":"LibCamera Devel ","Message-ID":"<20190524064227.tpcwx2aeeeehdog3@uno.localdomain>","References":"<20190523135900.24029-1-kieran.bingham@ideasonboard.com>\n\t<20190523135900.24029-2-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"multipart/signed; micalg=pgp-sha256;\n\tprotocol=\"application/pgp-signature\"; boundary=\"aewnwdqviowpayz4\"","Content-Disposition":"inline","In-Reply-To":"<20190523135900.24029-2-kieran.bingham@ideasonboard.com>","User-Agent":"NeoMutt/20180716","Subject":"Re: [libcamera-devel] [PATCH v2 1/3] libcamera: v4l2_device: Add\n\ttryFormat support","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Fri, 24 May 2019 06:41:20 -0000"}}]