{"id":1270,"url":"https://patchwork.libcamera.org/api/1.1/patches/1270/?format=json","web_url":"https://patchwork.libcamera.org/patch/1270/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20190523135900.24029-2-kieran.bingham@ideasonboard.com>","date":"2019-05-23T13:58:58","name":"[libcamera-devel,v2,1/3] libcamera: v4l2_device: Add tryFormat support","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"23332d8daeafc8810537f2ff849958c7c5526b58","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":{"id":11,"url":"https://patchwork.libcamera.org/api/1.1/users/11/?format=json","username":"kbingham","first_name":"Kieran","last_name":"Bingham","email":"kieran.bingham@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/1270/mbox/","series":[{"id":322,"url":"https://patchwork.libcamera.org/api/1.1/series/322/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=322","date":"2019-05-23T13:58:57","name":"V4L2Device Try format support","version":2,"mbox":"https://patchwork.libcamera.org/series/322/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/1270/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/1270/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AC7A060E4C\n\tfor ;\n\tThu, 23 May 2019 15:59:05 +0200 (CEST)","from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2CD3F5A9;\n\tThu, 23 May 2019 15:59:05 +0200 (CEST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1558619945;\n\tbh=fQR6EYg8bvGZyxZxt9HtJ6OF4ililgkffIPllMn/89c=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=MDPdKd6psv/au5RAq57RNOpru9c8EgP20s95SD5oPY6YzBgpHCnmRosYqvDRuJ83Z\n\ta6bBHK9qM+B6Kd02m/n0mbQo/EHib1Ln6pyT+2nb72x5mbF7DOsg66XleXlRSHlb1F\n\tUtfIcCtIMmqsKc78D3GJc5z1JMWNNJIYDgOokKvE=","From":"Kieran Bingham ","To":"LibCamera Devel ","Date":"Thu, 23 May 2019 14:58:58 +0100","Message-Id":"<20190523135900.24029-2-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20190523135900.24029-1-kieran.bingham@ideasonboard.com>","References":"<20190523135900.24029-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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":"Thu, 23 May 2019 13:59:06 -0000"},"content":"Extend the internal functionality of setFormat{Single,Multi}plane to\nallow 'trying' a format. This provides the facility of checking a format\nwith the driver before committing to it.\n\nSigned-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(-)","diff":"diff --git a/src/libcamera/include/v4l2_device.h b/src/libcamera/include/v4l2_device.h\nindex 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,\ndiff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp\nindex 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","prefixes":["libcamera-devel","v2","1/3"]}