Patch Detail
Show a patch.
GET /api/1.1/patches/10930/?format=api
{ "id": 10930, "url": "https://patchwork.libcamera.org/api/1.1/patches/10930/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10930/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210121165305.367801-3-jacopo@jmondi.org>", "date": "2021-01-21T16:53:00", "name": "[libcamera-devel,2/7] android: camera_device: Pass camera3 request to descriptor", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "ddaccfded9a2f16ae919f3ee070523f6b1fea458", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10930/mbox/", "series": [ { "id": 1593, "url": "https://patchwork.libcamera.org/api/1.1/series/1593/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1593", "date": "2021-01-21T16:52:58", "name": "android: camera device and metadata improvements", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1593/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10930/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10930/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 D109ABD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 21 Jan 2021 16:52:59 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6505268212;\n\tThu, 21 Jan 2021 17:52:59 +0100 (CET)", "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F153668203\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 21 Jan 2021 17:52:56 +0100 (CET)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 8ED501C0003;\n\tThu, 21 Jan 2021 16:52:56 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org,\n\tPaul Elder <paul.elder@ideasonboard.com>", "Date": "Thu, 21 Jan 2021 17:53:00 +0100", "Message-Id": "<20210121165305.367801-3-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.29.2", "In-Reply-To": "<20210121165305.367801-1-jacopo@jmondi.org>", "References": "<20210121165305.367801-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 2/7] android: camera_device: Pass camera3\n\trequest to descriptor", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The Camera3RequestDescriptor class can access the number of buffers\nand the frame number from the camera3_capture_request_t instead of\nhaving the caller passing them to the constructor.\n\nThis change allows to access other fields of the capture request, such\nas the capture settings.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 13 +++++++------\n src/android/camera_device.h | 3 +--\n 2 files changed, 8 insertions(+), 8 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 7c70a0b314e6..f10b572749eb 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -295,16 +295,18 @@ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n */\n \n CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n-\tCamera *camera, unsigned int frameNumber, unsigned int numBuffers)\n-\t: frameNumber_(frameNumber), numBuffers_(numBuffers)\n+\tCamera *camera, const camera3_capture_request_t *camera3Request)\n {\n-\tbuffers_ = new camera3_stream_buffer_t[numBuffers];\n+\tframeNumber_ = camera3Request->frame_number;\n+\n+\tnumBuffers_ = camera3Request->num_output_buffers;\n+\tbuffers_ = new camera3_stream_buffer_t[numBuffers_];\n \n \t/*\n \t * FrameBuffer instances created by wrapping a camera3 provided dmabuf\n \t * are emplaced in this vector of unique_ptr<> for lifetime management.\n \t */\n-\tframeBuffers_.reserve(numBuffers);\n+\tframeBuffers_.reserve(numBuffers_);\n \n \t/*\n \t * Create the libcamera::Request unique_ptr<> to tie its lifetime\n@@ -1683,8 +1685,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t * at request complete time.\n \t */\n \tCamera3RequestDescriptor *descriptor =\n-\t\tnew Camera3RequestDescriptor(camera_.get(), camera3Request->frame_number,\n-\t\t\t\t\t camera3Request->num_output_buffers);\n+\t\tnew Camera3RequestDescriptor(camera_.get(), camera3Request);\n \n \tLOG(HAL, Debug) << \"Queueing Request to libcamera with \"\n \t\t\t<< descriptor->numBuffers_ << \" HAL streams\";\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 912e54a60d4b..ab3c848edd0a 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -75,8 +75,7 @@ private:\n \n \tstruct Camera3RequestDescriptor {\n \t\tCamera3RequestDescriptor(libcamera::Camera *camera,\n-\t\t\t\t\t unsigned int frameNumber,\n-\t\t\t\t\t unsigned int numBuffers);\n+\t\t\t\t\t const camera3_capture_request_t *camera3Request);\n \t\t~Camera3RequestDescriptor();\n \n \t\tuint32_t frameNumber_;\n", "prefixes": [ "libcamera-devel", "2/7" ] }