{"id":16066,"url":"https://patchwork.libcamera.org/api/patches/16066/?format=json","web_url":"https://patchwork.libcamera.org/patch/16066/","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":"<20220527093440.953377-2-paul.elder@ideasonboard.com>","date":"2022-05-27T09:34:36","name":"[libcamera-devel,v2,1/5] android: camera_stream: Add sourceStream","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a2933dbaa973578a39ed623b3c24be2725fba834","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/16066/mbox/","series":[{"id":3145,"url":"https://patchwork.libcamera.org/api/series/3145/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3145","date":"2022-05-27T09:34:35","name":"Plumb the YUV processor in","version":2,"mbox":"https://patchwork.libcamera.org/series/3145/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/16066/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/16066/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 B2628BD161\n\tfor ;\n\tFri, 27 May 2022 09:34:56 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 12BD8633A1;\n\tFri, 27 May 2022 11:34:56 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D2657633A0\n\tfor ;\n\tFri, 27 May 2022 11:34:53 +0200 (CEST)","from pyrite.rasen.tech (softbank036240126034.bbtec.net\n\t[36.240.126.34])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5403E31A;\n\tFri, 27 May 2022 11:34:51 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653644096;\n\tbh=KxO/2uimKBM3LYo5hU7ddWIH7jib6xtDBlgFtCwVJsU=;\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=VWyjsTG6DJzA1MNkH+4rnARAY0nn0jPxHehETilcR0neSkdNoWWKSTSYtWNCYj2dQ\n\t1UgMeNdLppy+VrLuLxyBSuTdGpsqnkeArvqtUCov6Vu6CC9uDprpmSDVAbXkt16d2C\n\t73Yn/jccAzO6Dfo1q1QlJtC6U1MXEbYG+V6kcjq0XkzRCcGTodvVKl1qdr1ZdOHvOM\n\t7A0Ay1MCrhHkqglkGm76UX/X1iecWcri0xQJheKDecAktCwbFzMe4fVI5VYBMYXpf0\n\tmIvnQCxqM61o2xqmLr2JPkyDb6wDwuCLn2wf1jyncaA1JNN1LSolUUC+kLB5Vg85BV\n\t56t81XDKK0/pw==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653644093;\n\tbh=KxO/2uimKBM3LYo5hU7ddWIH7jib6xtDBlgFtCwVJsU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ItOYIBHp2MV8LvuDpdgEFEW7P3sBMTpHeYXzN9mIGABCqz05R0q11rZa2md7rS1A5\n\tcZg/gs9lIF3XK+HArDKMqdTXzkptwIzfpzCn9DGVTCMaK/+TvJ2pjqf15sabsAqoVQ\n\tllR4OAjzBM+MwaCY1fJ77MQG0EzZi5UbqyWpr0/E="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"ItOYIBHp\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 27 May 2022 18:34:36 +0900","Message-Id":"<20220527093440.953377-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20220527093440.953377-1-paul.elder@ideasonboard.com>","References":"<20220527093440.953377-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 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","From":"Paul Elder via libcamera-devel ","Reply-To":"Paul Elder ","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 \nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- fix whitespace\n---\n src/android/camera_device.cpp | 8 +++++++-\n src/android/camera_stream.cpp | 6 ++++--\n src/android/camera_stream.h | 6 +++++-\n 3 files changed, 16 insertions(+), 4 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8e804d4d..20599665 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -681,10 +681,16 @@ 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(&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 94f1884c..154e088e 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 f9504462..4c5078b2 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","v2","1/5"]}