Patch Detail
Show a patch.
GET /api/1.1/patches/9998/?format=api
{ "id": 9998, "url": "https://patchwork.libcamera.org/api/1.1/patches/9998/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9998/", "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": "<20201007101745.15104-7-jacopo@jmondi.org>", "date": "2020-10-07T10:17:38", "name": "[libcamera-devel,v3,06/13] android: camera_stream: Retrieve Stream and Configuration", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "0039f2c0f72dac9c9199a6c8a879f0bd75d6f099", "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/9998/mbox/", "series": [ { "id": 1361, "url": "https://patchwork.libcamera.org/api/1.1/series/1361/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1361", "date": "2020-10-07T10:17:32", "name": "android: CameraStream rework", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1361/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9998/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9998/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 986BCBEEDF\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Oct 2020 10:14:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 72E626039B;\n\tWed, 7 Oct 2020 12:14:00 +0200 (CEST)", "from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net\n\t[217.70.183.195])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0B53960396\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Oct 2020 12:13:59 +0200 (CEST)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 9588860008;\n\tWed, 7 Oct 2020 10:13:57 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 7 Oct 2020 12:17:38 +0200", "Message-Id": "<20201007101745.15104-7-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20201007101745.15104-1-jacopo@jmondi.org>", "References": "<20201007101745.15104-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 06/13] 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": "<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": "It'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\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\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 914e66b8f96a..47c423195796 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<CameraStream *>(stream->priv);\n-\t\tStreamConfiguration &cfg = config_->at(cameraStream->index());\n+\t\tconst StreamConfiguration &cfg = cameraStream->configuration();\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->camera3Stream().format != 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 e86a7ba60d46..9c7819efb679 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -33,6 +33,16 @@ CameraStream::CameraStream(CameraDevice *cameraDevice,\n \t\tencoder_ = std::make_unique<EncoderLibJpeg>();\n }\n \n+const StreamConfiguration &CameraStream::configuration() const\n+{\n+\treturn config_->at(index_);\n+}\n+\n+Stream *CameraStream::stream() const\n+{\n+\treturn configuration().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 d95c2a3831b0..d8d9d8c4b237 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -115,7 +115,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 &configuration() const;\n+\tlibcamera::Stream *stream() const;\n \n \tint configure(const libcamera::StreamConfiguration &cfg);\n \tint process(const libcamera::FrameBuffer &source,\n", "prefixes": [ "libcamera-devel", "v3", "06/13" ] }