{"id":9363,"url":"https://patchwork.libcamera.org/api/patches/9363/?format=json","web_url":"https://patchwork.libcamera.org/patch/9363/","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":"<20200822134605.17666-4-laurent.pinchart@ideasonboard.com>","date":"2020-08-22T13:46:05","name":"[libcamera-devel,3/3] v4l2: camera: Merge getStreamConfig() with open()","commit_ref":"3bd19855459f6b58360197bc67c545a698812899","pull_url":null,"state":"accepted","archived":false,"hash":"783568ffdf516d14eaeae3a311bd176522cc9b60","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9363/mbox/","series":[{"id":1232,"url":"https://patchwork.libcamera.org/api/series/1232/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1232","date":"2020-08-22T13:46:02","name":"v4l2: Miscellaneous cleanups","version":1,"mbox":"https://patchwork.libcamera.org/series/1232/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9363/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9363/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 E4DCCBE174\n\tfor ;\n\tSat, 22 Aug 2020 13:46:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6D6A9627B1;\n\tSat, 22 Aug 2020 15:46:30 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BEBBC6212A\n\tfor ;\n\tSat, 22 Aug 2020 15:46:28 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 682504FB\n\tfor ;\n\tSat, 22 Aug 2020 15:46:28 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"d3xpWiBq\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598103988;\n\tbh=RHUM7F0w7mlRZ5dB7kI6t5ppv38knZ6JesBd9ygDrIc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=d3xpWiBq3rRZpMrhmFsC5YGu9mmVfd18O8WSt+FiabYmXW5tpCZ4jlOa0MLdQcM0O\n\t5XyG+NXd+l69TZTC8H6geIa9a7W4u9xOYkOeNvxcKmz4ElXC21/RKt+7hpIdBV2veN\n\tQCVe/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()\n\twith open()","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The V4L2CameraProxy always calls V4L2Camera::getStreamConfig() right\nafter V4L2Camera::open(), and never afterwards. Simplify the code by\nreturning the initial configuration from V4L2Camera::open() and removing\nV4L2Camera::getStreamConfig().\n\nSigned-off-by: Laurent Pinchart \n---\n src/v4l2/v4l2_camera.cpp | 8 ++------\n src/v4l2/v4l2_camera.h | 4 ++--\n src/v4l2/v4l2_camera_proxy.cpp | 3 +--\n 3 files changed, 5 insertions(+), 10 deletions(-)","diff":"diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp\nindex 61bca0732447..24805d5f3c3f 100644\n--- a/src/v4l2/v4l2_camera.cpp\n+++ b/src/v4l2/v4l2_camera.cpp\n@@ -28,7 +28,7 @@ V4L2Camera::~V4L2Camera()\n \tclose();\n }\n \n-int V4L2Camera::open()\n+int V4L2Camera::open(StreamConfiguration *streamConfig)\n {\n \tif (camera_->acquire() < 0) {\n \t\tLOG(V4L2Compat, Error) << \"Failed to acquire camera\";\n@@ -43,6 +43,7 @@ int V4L2Camera::open()\n \n \tbufferAllocator_ = new FrameBufferAllocator(camera_);\n \n+\t*streamConfig = config_->at(0);\n \treturn 0;\n }\n \n@@ -64,11 +65,6 @@ void V4L2Camera::unbind()\n \tefd_ = -1;\n }\n \n-void V4L2Camera::getStreamConfig(StreamConfiguration *streamConfig)\n-{\n-\t*streamConfig = config_->at(0);\n-}\n-\n std::vector V4L2Camera::completedBuffers()\n {\n \tstd::vector v;\ndiff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h\nindex be6c4e187363..1fc5ebefef6a 100644\n--- a/src/v4l2/v4l2_camera.h\n+++ b/src/v4l2/v4l2_camera.h\n@@ -37,11 +37,11 @@ public:\n \tV4L2Camera(std::shared_ptr camera);\n \t~V4L2Camera();\n \n-\tint open();\n+\tint open(StreamConfiguration *streamConfig);\n \tvoid close();\n \tvoid bind(int efd);\n \tvoid unbind();\n-\tvoid getStreamConfig(StreamConfiguration *streamConfig);\n+\n \tstd::vector completedBuffers();\n \n \tint configure(StreamConfiguration *streamConfigOut,\ndiff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp\nindex 80287d8f164e..8ff990f68fcd 100644\n--- a/src/v4l2/v4l2_camera_proxy.cpp\n+++ b/src/v4l2/v4l2_camera_proxy.cpp\n@@ -63,13 +63,12 @@ int V4L2CameraProxy::open(V4L2CameraFile *file)\n \t * with count = 0.\n \t */\n \n-\tint ret = vcam_->open();\n+\tint ret = vcam_->open(&streamConfig_);\n \tif (ret < 0) {\n \t\trefcount_--;\n \t\treturn ret;\n \t}\n \n-\tvcam_->getStreamConfig(&streamConfig_);\n \tsetFmtFromConfig(streamConfig_);\n \n \tfiles_.insert(file);\n","prefixes":["libcamera-devel","3/3"]}