From patchwork Fri Jun 19 05:41:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 4085 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7FD1A603BF for ; Fri, 19 Jun 2020 07:41:46 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="twaA/TXG"; dkim-atps=neutral Received: from jade.flets-east.jp (unknown [IPv6:2400:4051:61:600:e972:d773:e99a:4f79]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id EF232556; Fri, 19 Jun 2020 07:41:44 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1592545306; bh=gFr7DJnqrrD48VO4JMq4OvrvnusUHZbSZNpenGeTllg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=twaA/TXGwvbNrOPnJ8lC0p4H6cDtsDjR3N88I5MV+xb+i90M/ZKdBIuTzzw9XvmRp 3U02VZkgAEf+3ST6eCCWeqKS1+AO4zvOGxHUDEYe6pZIQALiIxFvVkUNiakq1wpxpj I4l4fL6MreGYrLbF+kH1cp7OowuWNQtDafhX1jkM= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 19 Jun 2020 14:41:11 +0900 Message-Id: <20200619054123.19052-6-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619054123.19052-1-paul.elder@ideasonboard.com> References: <20200619054123.19052-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 05/17] v4l2: v4l2_camera_proxy: Implement VIDIOC_G/S_PRIORITY X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Jun 2020 05:41:46 -0000 Implement VIDIOC_G_PRIORITY and VIDIOC_S_PRIORITY, according to what v4l2-compliance wants. Signed-off-by: Paul Elder --- Changes in v2: - use V4L2CameraFile instead of fd and priorities map --- src/v4l2/v4l2_camera_proxy.cpp | 42 +++++++++++++++++++++++++++++++++- src/v4l2/v4l2_camera_proxy.h | 3 +++ 2 files changed, 44 insertions(+), 1 deletion(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 117d7ff..3e95645 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -37,7 +37,8 @@ V4L2CameraProxy::V4L2CameraProxy(unsigned int index, std::shared_ptr camera) : refcount_(0), index_(index), bufferCount_(0), currentBuf_(0), vcam_(std::make_unique(camera)), efd_(-1), - acquiredCf_(nullptr), initialized_(false) + v4l2RecordPriorityCf_(nullptr), acquiredCf_(nullptr), + initialized_(false) { querycap(camera); } @@ -344,6 +345,37 @@ int V4L2CameraProxy::vidioc_try_fmt(V4L2CameraFile *cf, struct v4l2_format *arg) return 0; } +int V4L2CameraProxy::vidioc_g_priority(V4L2CameraFile *cf, enum v4l2_priority *arg) +{ + LOG(V4L2Compat, Debug) << "Servicing vidioc_g_priority fd = " << cf->efd(); + + if (v4l2RecordPriorityCf_) + *arg = V4L2_PRIORITY_RECORD; + else + *arg = cf->priority_; + + return 0; +} + +int V4L2CameraProxy::vidioc_s_priority(V4L2CameraFile *cf, enum v4l2_priority *arg) +{ + LOG(V4L2Compat, Debug) + << "Servicing vidioc_s_priority fd = " << cf->efd() + << " prio = " << (int)*arg; + + if (v4l2RecordPriorityCf_ && v4l2RecordPriorityCf_ != cf) + return -EBUSY; + + if (*arg == V4L2_PRIORITY_RECORD) + v4l2RecordPriorityCf_ = cf; + else if (v4l2RecordPriorityCf_ == cf) + v4l2RecordPriorityCf_ = nullptr; + + cf->priority_ = *arg; + + return 0; +} + int V4L2CameraProxy::freeBuffers() { LOG(V4L2Compat, Debug) << "Freeing libcamera bufs"; @@ -560,6 +592,8 @@ std::set V4L2CameraProxy::supportedIoctls_ = { VIDIOC_G_FMT, VIDIOC_S_FMT, VIDIOC_TRY_FMT, + VIDIOC_G_PRIORITY, + VIDIOC_S_PRIORITY, VIDIOC_REQBUFS, VIDIOC_QUERYBUF, VIDIOC_QBUF, @@ -597,6 +631,12 @@ int V4L2CameraProxy::ioctl(V4L2CameraFile *cf, unsigned long request, void *arg) case VIDIOC_TRY_FMT: ret = vidioc_try_fmt(cf, static_cast(arg)); break; + case VIDIOC_G_PRIORITY: + ret = vidioc_g_priority(cf, static_cast(arg)); + break; + case VIDIOC_S_PRIORITY: + ret = vidioc_s_priority(cf, static_cast(arg)); + break; case VIDIOC_REQBUFS: ret = vidioc_reqbufs(cf, static_cast(arg)); break; diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index dd7e793..3260eec 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -51,6 +51,8 @@ private: int vidioc_g_fmt(V4L2CameraFile *cf, struct v4l2_format *arg); int vidioc_s_fmt(V4L2CameraFile *cf, struct v4l2_format *arg); int vidioc_try_fmt(V4L2CameraFile *cf, struct v4l2_format *arg); + int vidioc_g_priority(V4L2CameraFile *cf, enum v4l2_priority *arg); + int vidioc_s_priority(V4L2CameraFile *cf, enum v4l2_priority *arg); int vidioc_reqbufs(V4L2CameraFile *cf, struct v4l2_requestbuffers *arg); int vidioc_querybuf(V4L2CameraFile *cf, struct v4l2_buffer *arg); int vidioc_qbuf(V4L2CameraFile *cf, struct v4l2_buffer *arg); @@ -87,6 +89,7 @@ private: int efd_; + V4L2CameraFile *v4l2RecordPriorityCf_; /* * This is an exclusive lock on the camera. When this is not taken, * anybody can call any ioctl before reqbufs. reqbufs with count > 0