Patch Detail
Show a patch.
GET /api/1.1/patches/16150/?format=api
{ "id": 16150, "url": "https://patchwork.libcamera.org/api/1.1/patches/16150/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16150/", "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": "<20220604093025.77737-2-jacopo@jmondi.org>", "date": "2022-06-04T09:30:21", "name": "[libcamera-devel,v3,1/5] android: camera_stream: Add sourceStream", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "057d0e155c0fd0f0ef37d2b2f1bb91b704dbebe1", "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/16150/mbox/", "series": [ { "id": 3160, "url": "https://patchwork.libcamera.org/api/1.1/series/3160/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3160", "date": "2022-06-04T09:30:20", "name": "Plumb the YUV processor in", "version": 3, "mbox": "https://patchwork.libcamera.org/series/3160/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16150/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16150/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 DDDB2C326B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 4 Jun 2022 09:30:36 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 022C065639;\n\tSat, 4 Jun 2022 11:30:36 +0200 (CEST)", "from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[IPv6:2001:4b98:dc4:8::224])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E600565638\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 4 Jun 2022 11:30:33 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby mail.gandi.net (Postfix) with ESMTPSA id B1211E0005;\n\tSat, 4 Jun 2022 09:30:32 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1654335036;\n\tbh=Hoqdya9B4Hp6D3ZANuwtESF8KiPwTBDUe3zSKVjQOkE=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=nizT4Jb2wEqYNCzJXIdyY1h8V/xxDrxpDg7F3W9lNiY6N4ImXSrxbIdf+jOTlHjN1\n\tS6shByPj3GwXFgE8LWmakQIFNRHOgkDJazyEi9MbTTPVsZt8odqilsRtKdXB/Khj5V\n\tHsRuVkgq9KjO4CHanDiYvhy03b0gccLICJVU1u+CdjJ03fTO0tuQ8xQ2PU5P8TzGWp\n\tO7QNHoYQYIG2Zm3lypKtgWprZNblmRtaFrjPBJTI9b4it9R5w+2zLd9BBJqNX5zpW7\n\tBlhx4CMieGsioRxAMAIjp/ryU+FSMplEGFSsRtseIiARYo40hMuIFuWQXEqq4mI+4Z\n\tp+PmqfvxbPU0Q==", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 4 Jun 2022 11:30:21 +0200", "Message-Id": "<20220604093025.77737-2-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220604093025.77737-1-jacopo@jmondi.org>", "References": "<20220604093025.77737-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 1/5] android: camera_stream: Add\n\tsourceStream", "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>", "From": "Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Jacopo Mondi <jacopo@jmondi.org>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Hirokazu Honda <hiroh@chromium.org>\n\nAdd a sourceStream field to the CameraStream class, meant to contain a\nreference to the direct stream which produces actual image data for\nstreams of type CameraStream::Mapped.\n\nThe sourceStream of mapped streams will be used in later patches to make\nsure for each Mapped stream at least one libcamera::Stream is queued to\nthe libcamera::Camera.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/android/camera_device.cpp | 15 ++++++++++++++-\n src/android/camera_stream.cpp | 6 ++++--\n src/android/camera_stream.h | 6 +++++-\n 3 files changed, 23 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8e804d4d5aed..773cb3b66d48 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -681,10 +681,23 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \tfor (const auto &streamConfig : streamConfigs) {\n \t\tconfig->addConfiguration(streamConfig.config);\n \n+\t\tCameraStream *sourceStream = nullptr;\n \t\tfor (auto &stream : streamConfig.streams) {\n \t\t\tstreams_.emplace_back(this, config.get(), stream.type,\n-\t\t\t\t\t stream.stream, config->size() - 1);\n+\t\t\t\t\t stream.stream, sourceStream,\n+\t\t\t\t\t config->size() - 1);\n \t\t\tstream.stream->priv = static_cast<void *>(&streams_.back());\n+\n+\t\t\t/*\n+\t\t\t * The streamConfig.streams vector contains as its first\n+\t\t\t * element a Direct (or Internal) stream, and then an\n+\t\t\t * optional set of Mapped streams derived from the\n+\t\t\t * Direct stream. Cache the Direct stream pointer, to\n+\t\t\t * be used when constructing the subsequent mapped\n+\t\t\t * streams.\n+\t\t\t */\n+\t\t\tif (stream.type == CameraStream::Type::Direct)\n+\t\t\t\tsourceStream = &streams_.back();\n \t\t}\n \t}\n \ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 94f1884caa53..154e088e1b86 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -52,9 +52,11 @@ LOG_DECLARE_CATEGORY(HAL)\n \n CameraStream::CameraStream(CameraDevice *const cameraDevice,\n \t\t\t CameraConfiguration *config, Type type,\n-\t\t\t camera3_stream_t *camera3Stream, unsigned int index)\n+\t\t\t camera3_stream_t *camera3Stream,\n+\t\t\t CameraStream *const sourceStream, unsigned int index)\n \t: cameraDevice_(cameraDevice), config_(config), type_(type),\n-\t camera3Stream_(camera3Stream), index_(index)\n+\t camera3Stream_(camera3Stream), sourceStream_(sourceStream),\n+\t index_(index)\n {\n }\n \ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex f9504462b253..4c5078b2c26d 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -114,7 +114,9 @@ public:\n \t};\n \tCameraStream(CameraDevice *const cameraDevice,\n \t\t libcamera::CameraConfiguration *config, Type type,\n-\t\t camera3_stream_t *camera3Stream, unsigned int index);\n+\t\t camera3_stream_t *camera3Stream,\n+\t\t CameraStream *const sourceStream,\n+\t\t unsigned int index);\n \tCameraStream(CameraStream &&other);\n \t~CameraStream();\n \n@@ -122,6 +124,7 @@ public:\n \tcamera3_stream_t *camera3Stream() const { return camera3Stream_; }\n \tconst libcamera::StreamConfiguration &configuration() const;\n \tlibcamera::Stream *stream() const;\n+\tCameraStream *sourceStream() const { return sourceStream_; }\n \n \tint configure();\n \tint process(Camera3RequestDescriptor::StreamBuffer *streamBuffer);\n@@ -167,6 +170,7 @@ private:\n \tconst libcamera::CameraConfiguration *config_;\n \tconst Type type_;\n \tcamera3_stream_t *camera3Stream_;\n+\tCameraStream *const sourceStream_;\n \tconst unsigned int index_;\n \n \tstd::unique_ptr<PlatformFrameBufferAllocator> allocator_;\n", "prefixes": [ "libcamera-devel", "v3", "1/5" ] }