From patchwork Sat Aug 22 13:46:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9361 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id A3055BE174 for ; Sat, 22 Aug 2020 13:46:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C4DF862758; Sat, 22 Aug 2020 15:46:29 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="RuTeVQaf"; dkim-atps=neutral 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 2FEE76212A for ; Sat, 22 Aug 2020 15:46:28 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BFE6E4FB for ; Sat, 22 Aug 2020 15:46:27 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1598103987; bh=YoBvnr6VFlU1YA0d/v0pZ8gRr1ZEXwd5b91OeX700cY=; h=From:To:Subject:Date:In-Reply-To:References:From; b=RuTeVQafkDTVfPMtkMCgd07NH7I40gVQUgirC+s3QCgPXemQSVDQKk8sb04ek9TCV 4g4yZglZM4VusmKN4Sv/m13su+xLtovjUhxBCAFP8o3Cxr7xYL4rDkow/K9pyRlbac l9NzEhPJRPPZoDjkWwZ/0eefmcugj2Tjk2NMt664= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 22 Aug 2020 16:46:03 +0300 Message-Id: <20200822134605.17666-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200822134605.17666-1-laurent.pinchart@ideasonboard.com> References: <20200822134605.17666-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 1/3] v4l2: camera_proxy: Pass const reference to setFmtFromConfig() 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The setFmtFromConfig() method doesn't modify its parameter, make it const. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder --- src/v4l2/v4l2_camera_proxy.cpp | 4 ++-- src/v4l2/v4l2_camera_proxy.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 63affaeec1b3..079257f4bf22 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -162,10 +162,10 @@ bool V4L2CameraProxy::validateMemoryType(uint32_t memory) return memory == V4L2_MEMORY_MMAP; } -void V4L2CameraProxy::setFmtFromConfig(StreamConfiguration &streamConfig) +void V4L2CameraProxy::setFmtFromConfig(const StreamConfiguration &streamConfig) { const PixelFormatInfo &info = PixelFormatInfo::info(streamConfig.pixelFormat); - Size size = streamConfig.size; + const Size &size = streamConfig.size; curV4L2Format_.fmt.pix.width = size.width; curV4L2Format_.fmt.pix.height = size.height; diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index f06b5b87083c..79eb87bcea51 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -39,7 +39,7 @@ public: private: bool validateBufferType(uint32_t type); bool validateMemoryType(uint32_t memory); - void setFmtFromConfig(StreamConfiguration &streamConfig); + void setFmtFromConfig(const StreamConfiguration &streamConfig); void querycap(std::shared_ptr camera); int tryFormat(struct v4l2_format *arg); enum v4l2_priority maxPriority(); From patchwork Sat Aug 22 13:46:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9362 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 63EDABE173 for ; Sat, 22 Aug 2020 13:46:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 127516279A; Sat, 22 Aug 2020 15:46:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="hmwJQiRs"; dkim-atps=neutral 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 79BEC6212A for ; Sat, 22 Aug 2020 15:46:28 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 197B829E for ; Sat, 22 Aug 2020 15:46:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1598103988; bh=ZW/pjwbnH6j1zhvwvj/rLDCoZ6wMTIDazASCnShZz1Y=; h=From:To:Subject:Date:In-Reply-To:References:From; b=hmwJQiRs8yW90QWf9/8BqNmLpLgygombsh1LvTJ95yJTgM3l43rPWwvFf6F5JWkKU EcHR2grKxTZhx6GiTllmUQ5pnlHep2jJ11625kCsyXxscK7kS1n4Wc8p9cYxfEKP/V yUcIiOB55cBNbnZBm424V3sOhOM0Mpcczw5V3X9o= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 22 Aug 2020 16:46:04 +0300 Message-Id: <20200822134605.17666-3-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200822134605.17666-1-laurent.pinchart@ideasonboard.com> References: <20200822134605.17666-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 2/3] v4l2: camera_proxy: Store v4l2_pix_format instead of v4l2_format 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The V4L2 compatibility layer only uses the fmt.pix field of curV4L2Format_. There's no need to cache the full v4l2_format, store v4l2_pix_format only and rename the member variable from curV4L2Format_ to v4l2PixFormat_. While at it, group the V4L2-related member variables together in the V4L2CameraProxy class. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder --- src/v4l2/v4l2_camera_proxy.cpp | 32 ++++++++++++++++---------------- src/v4l2/v4l2_camera_proxy.h | 5 +++-- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 079257f4bf22..80287d8f164e 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -167,17 +167,17 @@ void V4L2CameraProxy::setFmtFromConfig(const StreamConfiguration &streamConfig) const PixelFormatInfo &info = PixelFormatInfo::info(streamConfig.pixelFormat); const Size &size = streamConfig.size; - curV4L2Format_.fmt.pix.width = size.width; - curV4L2Format_.fmt.pix.height = size.height; - curV4L2Format_.fmt.pix.pixelformat = info.v4l2Format; - curV4L2Format_.fmt.pix.field = V4L2_FIELD_NONE; - curV4L2Format_.fmt.pix.bytesperline = streamConfig.stride; - curV4L2Format_.fmt.pix.sizeimage = streamConfig.frameSize; - curV4L2Format_.fmt.pix.colorspace = V4L2_COLORSPACE_SRGB; - curV4L2Format_.fmt.pix.priv = V4L2_PIX_FMT_PRIV_MAGIC; - curV4L2Format_.fmt.pix.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; - curV4L2Format_.fmt.pix.quantization = V4L2_QUANTIZATION_DEFAULT; - curV4L2Format_.fmt.pix.xfer_func = V4L2_XFER_FUNC_DEFAULT; + v4l2PixFormat_.width = size.width; + v4l2PixFormat_.height = size.height; + v4l2PixFormat_.pixelformat = info.v4l2Format; + v4l2PixFormat_.field = V4L2_FIELD_NONE; + v4l2PixFormat_.bytesperline = streamConfig.stride; + v4l2PixFormat_.sizeimage = streamConfig.frameSize; + v4l2PixFormat_.colorspace = V4L2_COLORSPACE_SRGB; + v4l2PixFormat_.priv = V4L2_PIX_FMT_PRIV_MAGIC; + v4l2PixFormat_.ycbcr_enc = V4L2_YCBCR_ENC_DEFAULT; + v4l2PixFormat_.quantization = V4L2_QUANTIZATION_DEFAULT; + v4l2PixFormat_.xfer_func = V4L2_XFER_FUNC_DEFAULT; sizeimage_ = streamConfig.frameSize; } @@ -291,7 +291,7 @@ int V4L2CameraProxy::vidioc_g_fmt(V4L2CameraFile *file, struct v4l2_format *arg) return -EINVAL; memset(&arg->fmt, 0, sizeof(arg->fmt)); - arg->fmt.pix = curV4L2Format_.fmt.pix; + arg->fmt.pix = v4l2PixFormat_; return 0; } @@ -488,8 +488,8 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf if (bufferCount_ > 0) freeBuffers(); - Size size(curV4L2Format_.fmt.pix.width, curV4L2Format_.fmt.pix.height); - V4L2PixelFormat v4l2Format = V4L2PixelFormat(curV4L2Format_.fmt.pix.pixelformat); + Size size(v4l2PixFormat_.width, v4l2PixFormat_.height); + V4L2PixelFormat v4l2Format = V4L2PixelFormat(v4l2PixFormat_.pixelformat); int ret = vcam_->configure(&streamConfig_, size, PixelFormatInfo::info(v4l2Format).format, arg->count); @@ -511,9 +511,9 @@ int V4L2CameraProxy::vidioc_reqbufs(V4L2CameraFile *file, struct v4l2_requestbuf for (unsigned int i = 0; i < arg->count; i++) { struct v4l2_buffer buf = {}; buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE; - buf.length = curV4L2Format_.fmt.pix.sizeimage; + buf.length = v4l2PixFormat_.sizeimage; buf.memory = V4L2_MEMORY_MMAP; - buf.m.offset = i * curV4L2Format_.fmt.pix.sizeimage; + buf.m.offset = i * v4l2PixFormat_.sizeimage; buf.index = i; buf.flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; diff --git a/src/v4l2/v4l2_camera_proxy.h b/src/v4l2/v4l2_camera_proxy.h index 79eb87bcea51..92a79abb9e21 100644 --- a/src/v4l2/v4l2_camera_proxy.h +++ b/src/v4l2/v4l2_camera_proxy.h @@ -73,13 +73,14 @@ private: unsigned int refcount_; unsigned int index_; - struct v4l2_format curV4L2Format_; StreamConfiguration streamConfig_; - struct v4l2_capability capabilities_; unsigned int bufferCount_; unsigned int currentBuf_; unsigned int sizeimage_; + struct v4l2_capability capabilities_; + struct v4l2_pix_format v4l2PixFormat_; + std::vector buffers_; std::map mmaps_; From patchwork Sat Aug 22 13:46:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9363 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id E4DCCBE174 for ; Sat, 22 Aug 2020 13:46:31 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6D6A9627B1; Sat, 22 Aug 2020 15:46:30 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="d3xpWiBq"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BEBBC6212A for ; Sat, 22 Aug 2020 15:46:28 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 682504FB for ; Sat, 22 Aug 2020 15:46:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1598103988; bh=RHUM7F0w7mlRZ5dB7kI6t5ppv38knZ6JesBd9ygDrIc=; h=From:To:Subject:Date:In-Reply-To:References:From; b=d3xpWiBq3rRZpMrhmFsC5YGu9mmVfd18O8WSt+FiabYmXW5tpCZ4jlOa0MLdQcM0O 5XyG+NXd+l69TZTC8H6geIa9a7W4u9xOYkOeNvxcKmz4ElXC21/RKt+7hpIdBV2veN QCVe/bretgczgjRp0Xo/7FFcURAhrnReI9s8cIfQ= From: Laurent Pinchart To: libcamera-devel@lists.libcamera.org Date: Sat, 22 Aug 2020 16:46:05 +0300 Message-Id: <20200822134605.17666-4-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200822134605.17666-1-laurent.pinchart@ideasonboard.com> References: <20200822134605.17666-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 3/3] v4l2: camera: Merge getStreamConfig() with open() 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: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The V4L2CameraProxy always calls V4L2Camera::getStreamConfig() right after V4L2Camera::open(), and never afterwards. Simplify the code by returning the initial configuration from V4L2Camera::open() and removing V4L2Camera::getStreamConfig(). Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham Reviewed-by: Paul Elder --- src/v4l2/v4l2_camera.cpp | 8 ++------ src/v4l2/v4l2_camera.h | 4 ++-- src/v4l2/v4l2_camera_proxy.cpp | 3 +-- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 61bca0732447..24805d5f3c3f 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -28,7 +28,7 @@ V4L2Camera::~V4L2Camera() close(); } -int V4L2Camera::open() +int V4L2Camera::open(StreamConfiguration *streamConfig) { if (camera_->acquire() < 0) { LOG(V4L2Compat, Error) << "Failed to acquire camera"; @@ -43,6 +43,7 @@ int V4L2Camera::open() bufferAllocator_ = new FrameBufferAllocator(camera_); + *streamConfig = config_->at(0); return 0; } @@ -64,11 +65,6 @@ void V4L2Camera::unbind() efd_ = -1; } -void V4L2Camera::getStreamConfig(StreamConfiguration *streamConfig) -{ - *streamConfig = config_->at(0); -} - std::vector V4L2Camera::completedBuffers() { std::vector v; diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index be6c4e187363..1fc5ebefef6a 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -37,11 +37,11 @@ public: V4L2Camera(std::shared_ptr camera); ~V4L2Camera(); - int open(); + int open(StreamConfiguration *streamConfig); void close(); void bind(int efd); void unbind(); - void getStreamConfig(StreamConfiguration *streamConfig); + std::vector completedBuffers(); int configure(StreamConfiguration *streamConfigOut, diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 80287d8f164e..8ff990f68fcd 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -63,13 +63,12 @@ int V4L2CameraProxy::open(V4L2CameraFile *file) * with count = 0. */ - int ret = vcam_->open(); + int ret = vcam_->open(&streamConfig_); if (ret < 0) { refcount_--; return ret; } - vcam_->getStreamConfig(&streamConfig_); setFmtFromConfig(streamConfig_); files_.insert(file);