{"id":4185,"url":"https://patchwork.libcamera.org/api/patches/4185/?format=json","web_url":"https://patchwork.libcamera.org/patch/4185/","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":"<20200623190836.53446-12-paul.elder@ideasonboard.com>","date":"2020-06-23T19:08:25","name":"[libcamera-devel,v3,11/22] v4l2: v4l2_camera_proxy: Implement VIDIOC_ENUM_FRAMESIZES","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b1b259044591bf6a643ad46947be567251d2929f","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/4185/mbox/","series":[{"id":1034,"url":"https://patchwork.libcamera.org/api/series/1034/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1034","date":"2020-06-23T19:08:14","name":"Support v4l2-compliance","version":3,"mbox":"https://patchwork.libcamera.org/series/1034/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/4185/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/4185/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 34765609C7\n\tfor ;\n\tTue, 23 Jun 2020 21:09:29 +0200 (CEST)","from jade.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:8147:f2a2:a8c6:9087])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 70D152A9;\n\tTue, 23 Jun 2020 21:09:26 +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=\"G+5LgDij\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1592939369;\n\tbh=/LnaUCHTa0ygE/ypYIqNKSst20kVWIbdT9nSxSDmlyk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=G+5LgDijXa1hfp2+La8dYYG9CGsqGjc4nnBxveAMA4XrpPua2XSzIOBm+FgPGh7++\n\thjljv1uGAZ8MkWcUvVSItM3P4uPMXcMuoAwjdmRHVtkifadgmJVdswap2u+RqoLHR1\n\tOqrt4bxvbYjeil3h9hPR/Jqviqwt7kDLh/xopuRw=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Wed, 24 Jun 2020 04:08:25 +0900","Message-Id":"<20200623190836.53446-12-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200623190836.53446-1-paul.elder@ideasonboard.com>","References":"<20200623190836.53446-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 11/22] v4l2: v4l2_camera_proxy:\n\tImplement VIDIOC_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, 23 Jun 2020 19:09:29 -0000"},"content":"Implement VIDIOC_ENUM_FRAMESIZES in the V4L2 compatibility layer.\n\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v3:\n- cosmetic changes\n\nChanges in v2:\n- use V4L2CameraFile instead of fd\n- added todo for not many pipeline handlers reporting StreamFormats\n---\n src/v4l2/v4l2_camera_proxy.cpp | 26 ++++++++++++++++++++++++++\n src/v4l2/v4l2_camera_proxy.h | 1 +\n 2 files changed, 27 insertions(+)","diff":"diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 7925ed1..72b21ff 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -239,6 +239,28 @@ int V4L2CameraProxy::vidioc_querycap(struct v4l2_capability *arg)\n \treturn 0;\n }\n \n+int V4L2CameraProxy::vidioc_enum_framesizes(V4L2CameraFile *file, struct v4l2_frmsizeenum *arg)\n+{\n+\tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enum_framesizes fd = \" << file->efd();\n+\n+\tPixelFormat argFormat = v4l2ToDrm(arg->pixel_format);\n+\t/*\n+\t * \\todo This might need to be expanded as few pipeline handlers\n+\t * report StreamFormats.\n+\t */\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(V4L2CameraFile *file, struct v4l2_fmtdesc *arg)\n {\n \tLOG(V4L2Compat, Debug) << \"Servicing vidioc_enum_fmt fd = \" << file->efd();\n@@ -631,6 +653,7 @@ int V4L2CameraProxy::vidioc_streamoff(V4L2CameraFile *file, int *arg)\n \n const std::set V4L2CameraProxy::supportedIoctls_ = {\n \tVIDIOC_QUERYCAP,\n+\tVIDIOC_ENUM_FRAMESIZES,\n \tVIDIOC_ENUM_FMT,\n \tVIDIOC_G_FMT,\n \tVIDIOC_S_FMT,\n@@ -670,6 +693,9 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long request, void *ar\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(file, static_cast(arg));\n+\t\tbreak;\n \tcase VIDIOC_ENUM_FMT:\n \t\tret = vidioc_enum_fmt(file, static_cast(arg));\n \t\tbreak;\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex bc427d4..041f536 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -48,6 +48,7 @@ private:\n \tint freeBuffers();\n \n \tint vidioc_querycap(struct v4l2_capability *arg);\n+\tint vidioc_enum_framesizes(V4L2CameraFile *file, struct v4l2_frmsizeenum *arg);\n \tint vidioc_enum_fmt(V4L2CameraFile *file, struct v4l2_fmtdesc *arg);\n \tint vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg);\n \tint vidioc_s_fmt(V4L2CameraFile *file, struct v4l2_format *arg);\n","prefixes":["libcamera-devel","v3","11/22"]}