{"id":4050,"url":"https://patchwork.libcamera.org/api/patches/4050/?format=json","web_url":"https://patchwork.libcamera.org/patch/4050/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200616131244.70308-7-paul.elder@ideasonboard.com>","date":"2020-06-16T13:12:35","name":"[libcamera-devel,06/15] v4l2: v4l2_camera_proxy: Implement VIDIOC_ENUM_FRAMESIZES","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"2f1ee9a5ec3125a85163d208bf3d44f89ccd8c1a","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/4050/mbox/","series":[{"id":1006,"url":"https://patchwork.libcamera.org/api/series/1006/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1006","date":"2020-06-16T13:12:29","name":"Support v4l2-compliance","version":1,"mbox":"https://patchwork.libcamera.org/series/1006/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4050/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4050/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C0A2961F72\n\tfor ;\n\tTue, 16 Jun 2020 15:13:11 +0200 (CEST)","from jade.flets-east.jp (unknown\n\t[IPv6:2400:4051:61:600:2807:bdfa:f6a:8e53])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4E8C7F9;\n\tTue, 16 Jun 2020 15:13:10 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"b4zV8t3+\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1592313191;\n\tbh=gl4mx3/Yjp1Q2s0ElCcmgkIMgV6HnAGak8Vw6uEIPpU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=b4zV8t3+kCPZpIy0SbTJRWAQOiQ5GDqXqLJtWLGbHt5le6RxE2NN9OGFbXOP4sdbw\n\tEsq4QxR8KxQdiwO5wRO9+XG9BBrkjLnO0QGB7xlZoA7Mjx+elneLsWQI0ZGZjkFeyN\n\tcHVjAk8cNDArpbtBshJJngCDdxs/HnWmxNzvaUI8=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 16 Jun 2020 22:12:35 +0900","Message-Id":"<20200616131244.70308-7-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200616131244.70308-1-paul.elder@ideasonboard.com>","References":"<20200616131244.70308-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 06/15] v4l2: v4l2_camera_proxy: Implement\n\tVIDIOC_ENUM_FRAMESIZES","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","X-List-Received-Date":"Tue, 16 Jun 2020 13:13:12 -0000"},"content":"Implement VIDIOC_ENUM_FRAMESIZES in the V4L2 compatibility layer.\n\nSigned-off-by: Paul Elder \n---\n src/v4l2/v4l2_camera_proxy.cpp | 24 ++++++++++++++++++++++++\n src/v4l2/v4l2_camera_proxy.h | 1 +\n 2 files changed, 25 insertions(+)","diff":"diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 6c0dacc..a5fa478 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -251,6 +251,27 @@ int V4L2CameraProxy::vidioc_querycap(struct v4l2_capability *arg)\n \treturn 0;\n }\n \n+int V4L2CameraProxy::vidioc_enum_framesizes(int fd, struct v4l2_frmsizeenum *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enum_framesizes fd = \" << fd;\n+\n+\tif (arg == nullptr)\n+\t\treturn -EFAULT;\n+\n+\tPixelFormat argFormat = v4l2ToDrm(arg->pixel_format);\n+\tconst std::vector &frameSizes = streamConfig_.formats().sizes(argFormat);\n+\n+\tif (arg->index >= frameSizes.size())\n+\t\treturn -EINVAL;\n+\n+\targ->type = V4L2_FRMSIZE_TYPE_DISCRETE;\n+\targ->discrete.width = frameSizes[arg->index].width;\n+\targ->discrete.height = frameSizes[arg->index].height;\n+\tmemset(arg->reserved, 0, sizeof(arg->reserved));\n+\n+\treturn 0;\n+}\n+\n int V4L2CameraProxy::vidioc_enum_fmt(int fd, struct v4l2_fmtdesc *arg)\n {\n \tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enum_fmt fd = \" << fd;\n@@ -676,6 +697,9 @@ int V4L2CameraProxy::ioctl(int fd, unsigned long request, void *arg)\n \tcase VIDIOC_QUERYCAP:\n \t\tret = vidioc_querycap(static_cast(arg));\n \t\tbreak;\n+\tcase VIDIOC_ENUM_FRAMESIZES:\n+\t\tret = vidioc_enum_framesizes(fd, static_cast(arg));\n+\t\tbreak;\n \tcase VIDIOC_ENUM_FMT:\n \t\tret = vidioc_enum_fmt(fd, static_cast(arg));\n \t\tbreak;\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex 2e90bfd..2ff9571 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -45,6 +45,7 @@ private:\n \tint freeBuffers();\n \n \tint vidioc_querycap(struct v4l2_capability *arg);\n+\tint vidioc_enum_framesizes(int fd, struct v4l2_frmsizeenum *arg);\n \tint vidioc_enum_fmt(int fd, struct v4l2_fmtdesc *arg);\n \tint vidioc_g_fmt(int fd, struct v4l2_format *arg);\n \tint vidioc_s_fmt(int fd, struct v4l2_format *arg);\n","prefixes":["libcamera-devel","06/15"]}