{"id":15391,"url":"https://patchwork.libcamera.org/api/1.1/patches/15391/?format=json","web_url":"https://patchwork.libcamera.org/patch/15391/","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":"<20220225143607.62892-1-galof.nejc@gmail.com>","date":"2022-02-25T14:36:07","name":"[libcamera-devel,v3] The V4L2 adaptation layer can already support streaming with components such as OpenCV, however it is not accepting, or handling any requests to configure the frame rate.","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"49d72815e9537c2c49c8a57918d945b073bcc219","submitter":{"id":113,"url":"https://patchwork.libcamera.org/api/1.1/people/113/?format=json","name":"Nejc Galof","email":"galof.nejc@gmail.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15391/mbox/","series":[{"id":2942,"url":"https://patchwork.libcamera.org/api/1.1/series/2942/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2942","date":"2022-02-25T14:36:07","name":"[libcamera-devel,v3] The V4L2 adaptation layer can already support streaming with components such as OpenCV, however it is not accepting, or handling any requests to configure the frame rate.","version":3,"mbox":"https://patchwork.libcamera.org/series/2942/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15391/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15391/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 000A9BE08A\n\tfor ;\n\tFri, 25 Feb 2022 14:36:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 50AE261168;\n\tFri, 25 Feb 2022 15:36:19 +0100 (CET)","from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com\n\t[IPv6:2a00:1450:4864:20::32c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4730C61166\n\tfor ;\n\tFri, 25 Feb 2022 15:36:17 +0100 (CET)","by mail-wm1-x32c.google.com with SMTP id y5so1795976wmi.0\n\tfor ;\n\tFri, 25 Feb 2022 06:36:17 -0800 (PST)","from e28887faee29.8.8.8.8 ([91.224.238.83])\n\tby smtp.gmail.com with ESMTPSA id\n\ti15-20020a05600c354f00b0037c050d73ebsm2715891wmq.26.2022.02.25.06.36.15\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 25 Feb 2022 06:36:16 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"eOaGpzzJ\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112;\n\th=from:to:cc:subject:date:message-id;\n\tbh=tdxXKvHQF1H/63TdVZZfYAPp1pBDU2Kwnr+01R/d1yU=;\n\tb=eOaGpzzJP65T+N3/XkxcBib2xmZ9yjkt/AhSCfhC3r46eZiQxDN3WhM/1zxzK8bvne\n\tRUxF1Mu68wWCx4BGrzqOfp4xI9sF1Ml5BMUSXKNnfrastGGlufPoud3El4UorI3hj3PM\n\tqAWqebO5IHlKqYqKIFtgxDJyK9iOVpBY16om579aEMHXQjLiru1QwSKffUDhoAcOzWex\n\to1P3y0Ac9l/3gVVcg/5ltxQ6iDwFXLiaW+pLU3oaxbV/KtwlMi5OUjQW8PfQw9Lq/8Op\n\tY4rE6DO1f1juQQNBB+lgVzqHg1m4vbnqsDVtbOLeR31bIjDqMED10uoqeUzhFhegg/GJ\n\tqQQg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=tdxXKvHQF1H/63TdVZZfYAPp1pBDU2Kwnr+01R/d1yU=;\n\tb=6h6F/9yauDkKYoVX/B7WqtvBCyiFMeCKw17MjXn3xEX3HgeQv9LQ+kuNmXUCMsz43E\n\t+dAm4XwfH50TMP2XHzejTMQIJuEg949usKDrWmQk09p2B4hRmOOCBLwbY4WPC9xCP+q6\n\tLI0vJgqjSDslUkAKhAMXIFFMzVjzO2nKI6Hw8yBgTaDS4qBEc2YNMT+gV3MEQGszvO6X\n\tIF6+Fy5DKH3BdG4a/4wqzs9mZCz3wCYqpE6DdL82qFUGILbKLUHy8Ektj9JpSphx6Zy4\n\tN26bHoNF0UZ2c/u74UZXVs8f6elJDrwECHF+ORWvqnSMzcLEAqUzi8PGNZefLaKhzkDt\n\ts78w==","X-Gm-Message-State":"AOAM533UM6wd1TI/Nl2yJNhl9qcOzNpOQ3YotkoECE1T27zGrUzyfJoW\n\tYD8uebtIPPpNc/sxGKYxPxlAw+O6GL4o4A==","X-Google-Smtp-Source":"ABdhPJwDOAPaKJkQqM9+bjrsThyH77bVC2FaHXMB60Iq42k8OR0m2TTz+bmdBOSE4cFSxfg4dNyv8A==","X-Received":"by 2002:a05:600c:154f:b0:37d:f2e5:d89b with SMTP id\n\tf15-20020a05600c154f00b0037df2e5d89bmr2929290wmg.92.1645799776511; \n\tFri, 25 Feb 2022 06:36:16 -0800 (PST)","From":"Nejc Galof ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 25 Feb 2022 15:36:07 +0100","Message-Id":"<20220225143607.62892-1-galof.nejc@gmail.com>","X-Mailer":"git-send-email 2.17.1","Subject":"[libcamera-devel] [PATCH v3] The V4L2 adaptation layer can already\n\tsupport streaming with components such as OpenCV,\n\thowever it is not accepting,\n\tor handling any requests to configure the frame rate.","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"In V4L2 the frame rate is set by configuring the timeperframe component\nof the v4l2_streamparm structure through the VIDIOC_S_PARM ioctl.\n\nExtend the V4L2 compatibility layer to accept the VIDIOC_S_PARM ioctls\nand provide an interface for setting controls on the V4L2Camera class to\nset the requested rate when starting the camera.\n\nSigned-off-by: Nejc Galof \nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n src/v4l2/v4l2_camera.cpp | 12 +++++++++---\n src/v4l2/v4l2_camera.h | 5 +++++\n src/v4l2/v4l2_camera_proxy.cpp | 24 ++++++++++++++++++++++++\n src/v4l2/v4l2_camera_proxy.h | 1 +\n 4 files changed, 39 insertions(+), 3 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex e922b9e6..e4eb3a2b 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -12,13 +12,15 @@\n \n #include \n \n+#include \n+\n using namespace libcamera;\n \n LOG_DECLARE_CATEGORY(V4L2Compat)\n \n V4L2Camera::V4L2Camera(std::shared_ptr camera)\n-\t: camera_(camera), isRunning_(false), bufferAllocator_(nullptr),\n-\t efd_(-1), bufferAvailableCount_(0)\n+\t: camera_(camera), controls_(controls::controls), isRunning_(false),\n+\t bufferAllocator_(nullptr), efd_(-1), bufferAvailableCount_(0)\n {\n \tcamera_->requestCompleted.connect(this, &V4L2Camera::requestComplete);\n }\n@@ -203,10 +205,12 @@ int V4L2Camera::streamOn()\n \tif (isRunning_)\n \t\treturn 0;\n \n-\tint ret = camera_->start();\n+\tint ret = camera_->start(&controls_);\n \tif (ret < 0)\n \t\treturn ret == -EACCES ? -EBUSY : ret;\n \n+\tcontrols_.clear();\n+\n \tisRunning_ = true;\n \n \tfor (Request *req : pendingRequests_) {\n@@ -266,6 +270,8 @@ int V4L2Camera::qbuf(unsigned int index)\n \t\treturn 0;\n \t}\n \n+\trequest->controls().merge(std::move(controls_));\n+\n \tret = camera_->queueRequest(request);\n \tif (ret < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Can't queue request\";\ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex 03e74118..4c203e31 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -15,6 +15,7 @@\n #include \n \n #include \n+#include \n #include \n #include \n \n@@ -49,6 +50,8 @@ public:\n \t\t\t\t const libcamera::Size &size,\n \t\t\t\t libcamera::StreamConfiguration *streamConfigOut);\n \n+\tlibcamera::ControlList &controls() { return controls_; }\n+\n \tint allocBuffers(unsigned int count);\n \tvoid freeBuffers();\n \tint getBufferFd(unsigned int index);\n@@ -69,6 +72,8 @@ private:\n \tstd::shared_ptr camera_;\n \tstd::unique_ptr config_;\n \n+\tlibcamera::ControlList controls_;\n+\n \tbool isRunning_;\n \n \tlibcamera::Mutex bufferLock_;\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 74bd54ce..493c41c0 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -18,6 +18,8 @@\n #include \n \n #include \n+#include \n+#include \n #include \n \n #include \n@@ -33,6 +35,7 @@\n #define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))\n \n using namespace libcamera;\n+using namespace std::literals::chrono_literals;\n \n LOG_DECLARE_CATEGORY(V4L2Compat)\n \n@@ -755,6 +758,23 @@ int V4L2CameraProxy::vidioc_streamoff(V4L2CameraFile *file, int *arg)\n \treturn ret;\n }\n \n+int V4L2CameraProxy::vidioc_s_parm(V4L2CameraFile *file, struct v4l2_streamparm *arg)\n+{\n+\tLOG(V4L2Compat, Debug)\n+\t\t<< \"[\" << file->description() << \"] \" << __func__ << \"()\";\n+\n+\tif (!validateBufferType(arg->type))\n+\t\treturn -EINVAL;\n+\n+\tstruct v4l2_fract *timeperframe = &arg->parm.capture.timeperframe;\n+\tutils::Duration frameDuration = 1.0s * timeperframe->numerator / timeperframe->denominator;\n+\n+\tint64_t uDuration = frameDuration.get();\n+\tvcam_->controls().set(controls::FrameDurationLimits, { uDuration, uDuration });\n+\n+\treturn 0;\n+}\n+\n const std::set V4L2CameraProxy::supportedIoctls_ = {\n \tVIDIOC_QUERYCAP,\n \tVIDIOC_ENUM_FRAMESIZES,\n@@ -775,6 +795,7 @@ const std::set V4L2CameraProxy::supportedIoctls_ = {\n \tVIDIOC_EXPBUF,\n \tVIDIOC_STREAMON,\n \tVIDIOC_STREAMOFF,\n+\tVIDIOC_S_PARM,\n };\n \n int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long request, void *arg)\n@@ -852,6 +873,9 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *file, unsigned long request, void *ar\n \tcase VIDIOC_STREAMOFF:\n \t\tret = vidioc_streamoff(file, static_cast(arg));\n \t\tbreak;\n+\tcase VIDIOC_S_PARM:\n+\t\tret = vidioc_s_parm(file, static_cast(arg));\n+\t\tbreak;\n \tdefault:\n \t\tret = -ENOTTY;\n \t\tbreak;\ndiff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h\nindex 76ca2d8a..c1aeaff9 100644\n--- a/src/v4l2/v4l2_camera_proxy.h\n+++ b/src/v4l2/v4l2_camera_proxy.h\n@@ -65,6 +65,7 @@ private:\n \tint vidioc_expbuf(V4L2CameraFile *file, struct v4l2_exportbuffer *arg);\n \tint vidioc_streamon(V4L2CameraFile *file, int *arg);\n \tint vidioc_streamoff(V4L2CameraFile *file, int *arg);\n+\tint vidioc_s_parm(V4L2CameraFile *file, struct v4l2_streamparm *arg);\n \n \tbool hasOwnership(V4L2CameraFile *file);\n \tint acquire(V4L2CameraFile *file);\n","prefixes":["libcamera-devel","v3"]}