{"id":9953,"url":"https://patchwork.libcamera.org/api/patches/9953/?format=json","web_url":"https://patchwork.libcamera.org/patch/9953/","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":"<20201005104649.10812-7-laurent.pinchart@ideasonboard.com>","date":"2020-10-05T10:46:40","name":"[libcamera-devel,06/15] android: camera_stream: Retrieve Stream and Configuration","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5b5d16687414a17931d71ed79ff560f2c8727f4f","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9953/mbox/","series":[{"id":1349,"url":"https://patchwork.libcamera.org/api/series/1349/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1349","date":"2020-10-05T10:46:34","name":"CameraStream refactoring","version":1,"mbox":"https://patchwork.libcamera.org/series/1349/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9953/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9953/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 92D3BC3B5D\n\tfor ;\n\tMon, 5 Oct 2020 10:47:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3AA8A63BED;\n\tMon, 5 Oct 2020 12:47:40 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F2D4563C1B\n\tfor ;\n\tMon, 5 Oct 2020 12:47:35 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 801A63B;\n\tMon, 5 Oct 2020 12:47:35 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"r+Ank8XO\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894855;\n\tbh=ohsfGkm3PRkU4OkzD2nGcCuQ2xkvTSNISOtuRFKSF8A=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=r+Ank8XOZoax3B4dAQSa3+8OfGfEzvpEqbhLG7Ad+sXaVZPejHnvUH6wi/NegeCDc\n\tQIHX6YAMu2Czsg2bzOyUlze39RXPeraKDnifvr6+OfArG8N923m5dot4ej8PzZUSX/\n\tSiB0s8JtwAF0pD8SuzIbSwE9WCmiR/6900MnbEHQ=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 5 Oct 2020 13:46:40 +0300","Message-Id":"<20201005104649.10812-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","References":"<20201005104649.10812-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 06/15] android: camera_stream: Retrieve\n\tStream and Configuration","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"From: Jacopo Mondi \n\nIt's a common pattern to access the libcamera::Stream and\nlibcamera::StreamConfiguration using the CameraStream instance's\nindex.\n\nAdd two methods to the CameraStream to shorten access to the\ntwo fields. This allows removing the index() method from the class\ninterface.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 11 +++--------\n src/android/camera_stream.cpp | 10 ++++++++++\n src/android/camera_stream.h | 4 +++-\n 3 files changed, 16 insertions(+), 9 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex c44904300e0a..4f8f3e5790ca 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1292,7 +1292,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n \t\tCameraStream *cameraStream = static_cast(stream->priv);\n-\t\tStreamConfiguration &cfg = config_->at(cameraStream->index());\n+\t\tconst StreamConfiguration &cfg = cameraStream->streamConfiguration();\n \n \t\tint ret = cameraStream->configure(cfg);\n \t\tif (ret)\n@@ -1413,10 +1413,7 @@ int CameraDevice::processCaptureRequest(camera3_capture_request_t *camera3Reques\n \t\t}\n \t\tdescriptor->frameBuffers.emplace_back(buffer);\n \n-\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index());\n-\t\tStream *stream = streamConfiguration->stream();\n-\n-\t\trequest->addBuffer(stream, buffer);\n+\t\trequest->addBuffer(cameraStream->stream(), buffer);\n \t}\n \n \tint ret = camera_->queueRequest(request);\n@@ -1462,9 +1459,7 @@ void CameraDevice::requestComplete(Request *request)\n \t\tif (cameraStream->outputFormat() != HAL_PIXEL_FORMAT_BLOB)\n \t\t\tcontinue;\n \n-\t\tStreamConfiguration *streamConfiguration = &config_->at(cameraStream->index());\n-\t\tStream *stream = streamConfiguration->stream();\n-\t\tFrameBuffer *buffer = request->findBuffer(stream);\n+\t\tFrameBuffer *buffer = request->findBuffer(cameraStream->stream());\n \t\tif (!buffer) {\n \t\t\tLOG(HAL, Error) << \"Failed to find a source stream buffer\";\n \t\t\tcontinue;\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 072edc9457bb..250f0ab0a3b4 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -32,6 +32,16 @@ CameraStream::CameraStream(CameraDevice *cameraDev,\n \t\tencoder_.reset(new EncoderLibJpeg);\n }\n \n+const StreamConfiguration &CameraStream::streamConfiguration() const\n+{\n+\treturn config_->at(index_);\n+}\n+\n+Stream *CameraStream::stream() const\n+{\n+\treturn streamConfiguration().stream();\n+}\n+\n int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n {\n \tif (encoder_)\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex dbcd1e53219f..fa295a69404f 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -116,7 +116,9 @@ public:\n \tconst libcamera::PixelFormat &format() const { return format_; }\n \tconst libcamera::Size &size() const { return size_; }\n \tType type() const { return type_; }\n-\tunsigned int index() const { return index_; }\n+\n+\tconst libcamera::StreamConfiguration &streamConfiguration() const;\n+\tlibcamera::Stream *stream() const;\n \n \tint configure(const libcamera::StreamConfiguration &cfg);\n \tint process(libcamera::FrameBuffer *source,\n","prefixes":["libcamera-devel","06/15"]}