Patch Detail
Show a patch.
GET /api/patches/11651/?format=api
{ "id": 11651, "url": "https://patchwork.libcamera.org/api/patches/11651/?format=api", "web_url": "https://patchwork.libcamera.org/patch/11651/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20210323014226.3211412-7-hiroh@chromium.org>", "date": "2021-03-23T01:42:24", "name": "[libcamera-devel,6/8] android: Camera3RequestDescriptor: Manage buffers with std::vector", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c59cfd68ae37a6e21f6ffbc1fa5f9132de184f42", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/11651/mbox/", "series": [ { "id": 1817, "url": "https://patchwork.libcamera.org/api/series/1817/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1817", "date": "2021-03-23T01:42:18", "name": "Improve pointer types in android HAL adaptation layer", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1817/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/11651/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/11651/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 72783C32E2\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 23 Mar 2021 01:42:48 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 26FCB68D79;\n\tTue, 23 Mar 2021 02:42:48 +0100 (CET)", "from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com\n\t[IPv6:2607:f8b0:4864:20::1034])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 279C968D75\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 23 Mar 2021 02:42:46 +0100 (CET)", "by mail-pj1-x1034.google.com with SMTP id bt4so9355971pjb.5\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 22 Mar 2021 18:42:46 -0700 (PDT)", "from hiroh2.tok.corp.google.com\n\t([2401:fa00:8f:2:8115:e5cc:747b:64de])\n\tby smtp.gmail.com with ESMTPSA id\n\th13sm590527pjv.52.2021.03.22.18.42.43\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 22 Mar 2021 18:42:44 -0700 (PDT)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"M2bOfA7D\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=MRorFuuW+i3Eudcvysm6sAexmlSUngopmtWCo+wVBpo=;\n\tb=M2bOfA7D4sd+8LR7GzMsvxHgjTNMgZSTcX7tldWcxGUrrXYOeFnb/TvttaZkII1vTS\n\teVBEKfki40D6Dd96V1kK5ZkNxszbKuU4oSAu+9Qzjw8ggrGPpRi5CVHAjk45T4K1HFao\n\tBiFxJ3jNuKJbQEFxfeA///k09BeRAbg2SXNI0=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=MRorFuuW+i3Eudcvysm6sAexmlSUngopmtWCo+wVBpo=;\n\tb=hcQJzfdlBEx4uaWACl3CDTJyzZB9g2C0d0m8FKFqT1kgOf1ITUvrhhELB2zPwfNifS\n\t0O8GdCq8m3gdJl92WNTPymbYUBpV3MD/ZjakqG4af7sehXqPHj5CN49Vyeda4QKuYBP2\n\tFOUMXHAQuBspCzmbagYdYzKbU9ZBLZwf3mXKDQPcqqCLcZNnBA6JLWNylzXH00SQva3G\n\t0veAOqHQXjrkmOVYkJ7mxQb8r/v5YvqD6DakDgIn6PowhD2Mj0pPAjxSL0MI3tCNVxBN\n\tQcwUWwHXqSJeFlEkLI73CTp+rrWHXLXnTd+lqFsVySzjP2miPZ8akzggbrrd9JXLQC2+\n\tk6SQ==", "X-Gm-Message-State": "AOAM533uuSIFYXJuxJlq59LKnKlNSCJelhktvOvNGCL83TC5orLqoWVt\n\t6XFYgOZSrV5ioVxvKKoMvTpkNfuBfY/u5w==", "X-Google-Smtp-Source": "ABdhPJxaJfZ1sg4s3TQNYxjedgNtNPMAjpP5Uh0ARaclMNSV+osdgtbLowCjG0MdOrtOoUfqXqJ3EQ==", "X-Received": "by 2002:a17:90a:c588:: with SMTP id\n\tl8mr1868881pjt.120.1616463764598; \n\tMon, 22 Mar 2021 18:42:44 -0700 (PDT)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 23 Mar 2021 10:42:24 +0900", "Message-Id": "<20210323014226.3211412-7-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.31.0.rc2.261.g7f71774620-goog", "In-Reply-To": "<20210323014226.3211412-1-hiroh@chromium.org>", "References": "<20210323014226.3211412-1-hiroh@chromium.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 6/8] android: Camera3RequestDescriptor:\n\tManage buffers with std::vector", "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": "Camera3RequestDescriptor has a length and an allocated buffer\nfor camera_stream_buffer_t array. This replaces the variables\nwith std::vector.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n\n---\n src/android/camera_device.cpp | 37 +++++++++++++++--------------------\n src/android/camera_device.h | 3 +--\n 2 files changed, 17 insertions(+), 23 deletions(-)\n\n--\n2.31.0.rc2.261.g7f71774620-goog", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex c0630e53..b000d332 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -271,16 +271,16 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n \tframeNumber_ = camera3Request->frame_number;\n\n \t/* Copy the camera3 request stream information for later access. */\n-\tnumBuffers_ = camera3Request->num_output_buffers;\n-\tbuffers_ = new camera3_stream_buffer_t[numBuffers_];\n-\tfor (unsigned int i = 0; i < numBuffers_; ++i)\n+\tconst uint32_t numBuffers = camera3Request->num_output_buffers;\n+\tbuffers_.resize(numBuffers);\n+\tfor (uint32_t i = 0; i < numBuffers; i++)\n \t\tbuffers_[i] = camera3Request->output_buffers[i];\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/* Clone the controls associated with the camera3 request. */\n \tsettings_ = CameraMetadata(camera3Request->settings);\n@@ -294,10 +294,7 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor(\n \t\t\t\t\t\t reinterpret_cast<uint64_t>(this));\n }\n\n-CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor()\n-{\n-\tdelete[] buffers_;\n-}\n+CameraDevice::Camera3RequestDescriptor::~Camera3RequestDescriptor() = default;\n\n /*\n * \\class CameraDevice\n@@ -1840,10 +1837,10 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\tdescriptor->settings_ = lastSettings_;\n\n \tLOG(HAL, Debug) << \"Queueing request \" << descriptor->request_->cookie()\n-\t\t\t<< \" with \" << descriptor->numBuffers_ << \" streams\";\n-\tfor (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {\n-\t\tconst camera3_stream_buffer_t *camera3Buffer = &descriptor->buffers_[i];\n-\t\tcamera3_stream *camera3Stream = camera3Buffer->stream;\n+\t\t\t<< \" with \" << descriptor->buffers_.size() << \" streams\";\n+\tfor (unsigned int i = 0; i < descriptor->buffers_.size(); ++i) {\n+\t\tconst camera3_stream_buffer_t &camera3Buffer = descriptor->buffers_[i];\n+\t\tcamera3_stream *camera3Stream = camera3Buffer.stream;\n \t\tCameraStream *cameraStream = static_cast<CameraStream *>(camera3Stream->priv);\n\n \t\tstd::stringstream ss;\n@@ -1874,7 +1871,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t\t * associate it with the Camera3RequestDescriptor for\n \t\t\t * lifetime management only.\n \t\t\t */\n-\t\t\tbuffer = createFrameBuffer(*camera3Buffer->buffer);\n+\t\t\tbuffer = createFrameBuffer(*camera3Buffer.buffer);\n \t\t\tdescriptor->frameBuffers_.emplace_back(buffer);\n \t\t\tLOG(HAL, Debug) << ss.str() << \" (direct)\";\n \t\t\tbreak;\n@@ -1899,7 +1896,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t}\n\n \t\tdescriptor->request_->addBuffer(cameraStream->stream(), buffer,\n-\t\t\t\t\t\tcamera3Buffer->acquire_fence);\n+\t\t\t\t\t\tcamera3Buffer.acquire_fence);\n \t}\n\n \t/*\n@@ -1930,7 +1927,7 @@ void CameraDevice::requestComplete(Request *request)\n \t}\n\n \tLOG(HAL, Debug) << \"Request \" << request->cookie() << \" completed with \"\n-\t\t\t<< descriptor->numBuffers_ << \" streams\";\n+\t\t\t<< descriptor->buffers_.size() << \" streams\";\n\n \t/*\n \t * \\todo The timestamp used for the metadata is currently always taken\n@@ -1942,7 +1939,7 @@ void CameraDevice::requestComplete(Request *request)\n \tresultMetadata = getResultMetadata(descriptor, timestamp);\n\n \t/* Handle any JPEG compression. */\n-\tfor (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {\n+\tfor (unsigned int i = 0; i < descriptor->buffers_.size(); ++i) {\n \t\tCameraStream *cameraStream =\n \t\t\tstatic_cast<CameraStream *>(descriptor->buffers_[i].stream->priv);\n\n@@ -1975,15 +1972,13 @@ void CameraDevice::requestComplete(Request *request)\n \t/* Prepare to call back the Android camera stack. */\n \tcamera3_capture_result_t captureResult = {};\n \tcaptureResult.frame_number = descriptor->frameNumber_;\n-\tcaptureResult.num_output_buffers = descriptor->numBuffers_;\n-\tfor (unsigned int i = 0; i < descriptor->numBuffers_; ++i) {\n+\tcaptureResult.num_output_buffers = descriptor->buffers_.size();\n+\tfor (unsigned int i = 0; i < descriptor->buffers_.size(); ++i) {\n \t\tdescriptor->buffers_[i].acquire_fence = -1;\n \t\tdescriptor->buffers_[i].release_fence = -1;\n \t\tdescriptor->buffers_[i].status = status;\n \t}\n-\tcaptureResult.output_buffers =\n-\t\tconst_cast<const camera3_stream_buffer_t *>(descriptor->buffers_);\n-\n+\tcaptureResult.output_buffers = descriptor->buffers_.data();\n\n \tif (status == CAMERA3_BUFFER_STATUS_OK) {\n \t\tnotifyShutter(descriptor->frameNumber_, timestamp);\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 14e26b4d..a11cf243 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -74,8 +74,7 @@ private:\n \t\t~Camera3RequestDescriptor();\n\n \t\tuint32_t frameNumber_;\n-\t\tuint32_t numBuffers_;\n-\t\tcamera3_stream_buffer_t *buffers_;\n+\t\tstd::vector<camera3_stream_buffer_t> buffers_;\n \t\tstd::vector<std::unique_ptr<libcamera::FrameBuffer>> frameBuffers_;\n \t\tCameraMetadata settings_;\n \t\tstd::unique_ptr<CaptureRequest> request_;\n", "prefixes": [ "libcamera-devel", "6/8" ] }