Patch Detail
Show a patch.
GET /api/1.1/patches/10001/?format=api
{ "id": 10001, "url": "https://patchwork.libcamera.org/api/1.1/patches/10001/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10001/", "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-10-jacopo@jmondi.org>", "date": "2020-10-07T10:17:41", "name": "[libcamera-devel,v3,09/13] android: camera_device: Make CameraStream configuration nicer", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "bc6d8343da49274185f1956a50ecaecc3763b631", "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/10001/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/10001/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10001/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 7748DBEEE1\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 7 Oct 2020 10:14:03 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3CDE360557;\n\tWed, 7 Oct 2020 12:14:03 +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 31AF560494\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 7 Oct 2020 12:14:02 +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 47D0F60014;\n\tWed, 7 Oct 2020 10:14:01 +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:41 +0200", "Message-Id": "<20201007101745.15104-10-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 09/13] android: camera_device: Make\n\tCameraStream configuration nicer", "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": "Loop over the CameraStream instances and use their interface to perform\nCameraStream configuration.\n\nModify CameraStream::configure() to configure the android stream buffer\ncount and to retrieve the StreamConfiguration by index instead of\nreceiving it as a parameter.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 15 +++++----------\n src/android/camera_stream.cpp | 11 ++++++++---\n src/android/camera_stream.h | 2 +-\n 3 files changed, 14 insertions(+), 14 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 678dca609003..1e2cbeeb92d1 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1287,17 +1287,12 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t * StreamConfiguration and set the number of required buffers in\n \t * the Android camera3_stream_t.\n \t */\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\tconst StreamConfiguration &cfg = cameraStream->configuration();\n-\n-\t\tint ret = cameraStream->configure(cfg);\n-\t\tif (ret)\n+\tfor (CameraStream &cameraStream : streams_) {\n+\t\tint ret = cameraStream.configure();\n+\t\tif (ret) {\n+\t\t\tLOG(HAL, Error) << \"Failed to configure camera stream\";\n \t\t\treturn ret;\n-\n-\t\t/* Use the bufferCount confirmed by the validation process. */\n-\t\tstream->max_buffers = cfg.bufferCount;\n+\t\t}\n \t}\n \n \t/*\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 3946a2cdf844..f899be4fe007 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -38,10 +38,15 @@ Stream *CameraStream::stream() const\n \treturn configuration().stream();\n }\n \n-int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n+int CameraStream::configure()\n {\n-\tif (encoder_)\n-\t\treturn encoder_->configure(cfg);\n+\tif (encoder_) {\n+\t\tint ret = encoder_->configure(configuration());\n+\t\tif (ret)\n+\t\t\treturn ret;\n+\t}\n+\n+\tcamera3Stream_->max_buffers = configuration().bufferCount;\n \n \treturn 0;\n }\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex f46cfd605d03..4c51f0fb3393 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -114,7 +114,7 @@ public:\n \tconst libcamera::StreamConfiguration &configuration() const;\n \tlibcamera::Stream *stream() const;\n \n-\tint configure(const libcamera::StreamConfiguration &cfg);\n+\tint configure();\n \tint process(const libcamera::FrameBuffer &source,\n \t\t MappedCamera3Buffer *dest, CameraMetadata *metadata);\n \n", "prefixes": [ "libcamera-devel", "v3", "09/13" ] }