{"id":8655,"url":"https://patchwork.libcamera.org/api/patches/8655/?format=json","web_url":"https://patchwork.libcamera.org/patch/8655/","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":"<20200706153808.2340919-5-kieran.bingham@ideasonboard.com>","date":"2020-07-06T15:38:04","name":"[libcamera-devel,v4,4/8] android: camera_device: Simplify FrameBuffer construction from a buffer_handle_t","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4a74969bb15b507bb06d997dbb4a750fa19cd96b","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8655/mbox/","series":[{"id":1088,"url":"https://patchwork.libcamera.org/api/series/1088/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1088","date":"2020-07-06T15:38:00","name":"android: Multi-stream support","version":4,"mbox":"https://patchwork.libcamera.org/series/1088/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8655/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8655/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 EEDCDBD790\n\tfor ;\n\tMon, 6 Jul 2020 15:38:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BB17F60E18;\n\tMon, 6 Jul 2020 17:38:18 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 378D860E14\n\tfor ;\n\tMon, 6 Jul 2020 17:38:14 +0200 (CEST)","from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net\n\t[86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B318ED98;\n\tMon, 6 Jul 2020 17:38:13 +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=\"jGO+GV2e\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594049893;\n\tbh=FIgZ7tdHmAgZPdqa+5fkin4TBMksUd11jEpciokXp24=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=jGO+GV2eNsyn/dOrdygreI6Kf6i6ZoQE7R4D+IKbyrlt9sBMWDhpdJD3LdHm+WOrh\n\tdDqDG6pMDBMw/Vhsa/JaeCwt6NmXY1IuIv3lCh8uiVFyrk8DQf8dlLKZ8cEI7O6zAz\n\teOOHlCzAO9uLefKvEg81qVWJBM5VZ0nwiAhysCX8=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Mon, 6 Jul 2020 16:38:04 +0100","Message-Id":"<20200706153808.2340919-5-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200706153808.2340919-1-kieran.bingham@ideasonboard.com>","References":"<20200706153808.2340919-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 4/8] android: camera_device: Simplify\n\tFrameBuffer construction from a buffer_handle_t","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":"Move the code which constructs a FrameBuffer from the Android buffer handle\nto it's own function to simplify the code flow and readability.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nReviewed-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 35 +++++++++++++++++++----------------\n src/android/camera_device.h | 1 +\n 2 files changed, 20 insertions(+), 16 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 03dcdd520794..73cfab532cf5 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1011,6 +1011,24 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \treturn 0;\n }\n \n+FrameBuffer *CameraDevice::createFrameBuffer(const buffer_handle_t camera3buffer)\n+{\n+\tstd::vector planes;\n+\tfor (unsigned int i = 0; i < 3; i++) {\n+\t\tFrameBuffer::Plane plane;\n+\t\tplane.fd = FileDescriptor(camera3buffer->data[i]);\n+\t\t/*\n+\t\t * Setting length to zero here is OK as the length is only used\n+\t\t * to map the memory of the plane. Libcamera do not need to poke\n+\t\t * at the memory content queued by the HAL.\n+\t\t */\n+\t\tplane.length = 0;\n+\t\tplanes.push_back(std::move(plane));\n+\t}\n+\n+\treturn new FrameBuffer(std::move(planes));\n+}\n+\n int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Request)\n {\n \tStreamConfiguration *streamConfiguration = &config_->at(0);\n@@ -1064,22 +1082,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t * Create a libcamera buffer using the dmabuf descriptors of the first\n \t * and (currently) only supported request buffer.\n \t */\n-\tconst buffer_handle_t camera3Handle = *camera3Buffers[0].buffer;\n-\n-\tstd::vector planes;\n-\tfor (int i = 0; i < 3; i++) {\n-\t\tFrameBuffer::Plane plane;\n-\t\tplane.fd = FileDescriptor(camera3Handle->data[i]);\n-\t\t/*\n-\t\t * Setting length to zero here is OK as the length is only used\n-\t\t * to map the memory of the plane. Libcamera do not need to poke\n-\t\t * at the memory content queued by the HAL.\n-\t\t */\n-\t\tplane.length = 0;\n-\t\tplanes.push_back(std::move(plane));\n-\t}\n-\n-\tFrameBuffer *buffer = new FrameBuffer(std::move(planes));\n+\tFrameBuffer *buffer = createFrameBuffer(*camera3Buffers[0].buffer);\n \tif (!buffer) {\n \t\tLOG(HAL, Error) << \"Failed to create buffer\";\n \t\tdelete descriptor;\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 5bd6cf416156..d7834d94f439 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -70,6 +70,7 @@ private:\n \n \tint initializeStreamConfigurations();\n \tstd::tuple calculateStaticMetadataSize();\n+\tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n \tvoid notifyError(uint32_t frameNumber, camera3_stream_t *stream);\n \tlibcamera::PixelFormat toPixelFormat(int format);\n","prefixes":["libcamera-devel","v4","4/8"]}