[libcamera-devel] [PATCH 06/15] v4l2: v4l2_camera_proxy: Implement VIDIOC_ENUM_FRAMESIZES

Paul Elder paul.elder at ideasonboard.com
Tue Jun 16 15:12:35 CEST 2020


Implement VIDIOC_ENUM_FRAMESIZES in the V4L2 compatibility layer.

Signed-off-by: Paul Elder <paul.elder at ideasonboard.com>
---
 src/v4l2/v4l2_camera_proxy.cpp | 24 ++++++++++++++++++++++++
 src/v4l2/v4l2_camera_proxy.h   |  1 +
 2 files changed, 25 insertions(+)

diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp
index 6c0dacc..a5fa478 100644
--- a/src/v4l2/v4l2_camera_proxy.cpp
+++ b/src/v4l2/v4l2_camera_proxy.cpp
@@ -251,6 +251,27 @@ int V4L2CameraProxy::vidioc_querycap(struct v4l2_capability *arg)
 	return 0;
 }
 
+int V4L2CameraProxy::vidioc_enum_framesizes(int fd, struct v4l2_frmsizeenum *arg)
+{
+	LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_framesizes fd = " << fd;
+
+	if (arg == nullptr)
+		return -EFAULT;
+
+	PixelFormat argFormat = v4l2ToDrm(arg->pixel_format);
+	const std::vector<Size> &frameSizes = streamConfig_.formats().sizes(argFormat);
+
+	if (arg->index >= frameSizes.size())
+		return -EINVAL;
+
+	arg->type = V4L2_FRMSIZE_TYPE_DISCRETE;
+	arg->discrete.width = frameSizes[arg->index].width;
+	arg->discrete.height = frameSizes[arg->index].height;
+	memset(arg->reserved, 0, sizeof(arg->reserved));
+
+	return 0;
+}
+
 int V4L2CameraProxy::vidioc_enum_fmt(int fd, struct v4l2_fmtdesc *arg)
 {
 	LOG(V4L2Compat, Debug) << "Servicing vidioc_enum_fmt fd = " << fd;
@@ -676,6 +697,9 @@ int V4L2CameraProxy::ioctl(int fd, unsigned long request, void *arg)
 	case VIDIOC_QUERYCAP:
 		ret = vidioc_querycap(static_cast<struct v4l2_capability *>(arg));
 		break;
+	case VIDIOC_ENUM_FRAMESIZES:
+		ret = vidioc_enum_framesizes(fd, static_cast<struct v4l2_frmsizeenum *>(arg));
+		break;
 	case VIDIOC_ENUM_FMT:
 		ret = vidioc_enum_fmt(fd, static_cast<struct v4l2_fmtdesc *>(arg));
 		break;
diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h
index 2e90bfd..2ff9571 100644
--- a/src/v4l2/v4l2_camera_proxy.h
+++ b/src/v4l2/v4l2_camera_proxy.h
@@ -45,6 +45,7 @@ private:
 	int freeBuffers();
 
 	int vidioc_querycap(struct v4l2_capability *arg);
+	int vidioc_enum_framesizes(int fd, struct v4l2_frmsizeenum *arg);
 	int vidioc_enum_fmt(int fd, struct v4l2_fmtdesc *arg);
 	int vidioc_g_fmt(int fd, struct v4l2_format *arg);
 	int vidioc_s_fmt(int fd, struct v4l2_format *arg);
-- 
2.27.0



More information about the libcamera-devel mailing list