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);