{"id":15266,"url":"https://patchwork.libcamera.org/api/1.1/patches/15266/?format=json","web_url":"https://patchwork.libcamera.org/patch/15266/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20220110165524.72978-2-jacopo@jmondi.org>","date":"2022-01-10T16:55:20","name":"[libcamera-devel,1/5] android: camera_stream: Add sourceStream","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"1c50256013c40f11cb8083c2fe158b3717646a3a","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":{"id":15,"url":"https://patchwork.libcamera.org/api/1.1/users/15/?format=json","username":"jmondi","first_name":"Jacopo","last_name":"Mondi","email":"jacopo@jmondi.org"},"mbox":"https://patchwork.libcamera.org/patch/15266/mbox/","series":[{"id":2887,"url":"https://patchwork.libcamera.org/api/1.1/series/2887/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2887","date":"2022-01-10T16:55:19","name":"android: Plumb the YUV processor in","version":1,"mbox":"https://patchwork.libcamera.org/series/2887/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15266/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15266/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 9E0FFC3259\n\tfor ;\n\tMon, 10 Jan 2022 16:54:30 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3C52F6093C;\n\tMon, 10 Jan 2022 17:54:30 +0100 (CET)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 8554F6021A\n\tfor ;\n\tMon, 10 Jan 2022 17:54:29 +0100 (CET)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id CBF24240007;\n\tMon, 10 Jan 2022 16:54:28 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 10 Jan 2022 17:55:20 +0100","Message-Id":"<20220110165524.72978-2-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20220110165524.72978-1-jacopo@jmondi.org>","References":"<20220110165524.72978-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Hirokazu Honda \n\nAdd to the CameraStream class a sourceStream field, which for streams\nof type Mapped contains a reference to the stream which produces the\nactual image data.\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 \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 9 ++++++++-\n src/android/camera_stream.cpp | 6 ++++--\n src/android/camera_stream.h | 6 +++++-\n 3 files changed, 17 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 83825736ce31..005d95b51a0c 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -681,10 +681,17 @@ 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+\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(&streams_.back());\n+\n+\t\t\t/* Mapped streams are always associated with a Direct one. */\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 c21574501916..032b0407bd32 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 allocator_;\n","prefixes":["libcamera-devel","1/5"]}