Patch Detail
Show a patch.
GET /api/1.1/patches/9958/?format=api
{ "id": 9958, "url": "https://patchwork.libcamera.org/api/1.1/patches/9958/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9958/", "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": "<20201005104649.10812-12-laurent.pinchart@ideasonboard.com>", "date": "2020-10-05T10:46:45", "name": "[libcamera-devel,11/15] android: camera_device: Make CameraStream configuration nicer", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f657925e6454e38631f060a64e84e50545493d2b", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9958/mbox/", "series": [ { "id": 1349, "url": "https://patchwork.libcamera.org/api/1.1/series/1349/?format=api", "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/9958/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9958/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 7723AC3B5D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 5 Oct 2020 10:47:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 40C0A63BFE;\n\tMon, 5 Oct 2020 12:47:43 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E43C363C23\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 5 Oct 2020 12:47:37 +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 7D0CD59E;\n\tMon, 5 Oct 2020 12:47:37 +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=\"fsKpfWAd\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1601894857;\n\tbh=mvN0I6FK3ed1Qwneht64CEk1suW1Vz1q+JMDrACRHGU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fsKpfWAdkxHJZNnp5r1Bm0g1ofUIUbZlyfUIZbJuR99XZjpSBBhpNjaSKTce9zyrb\n\t5DS101MDEkDhetAduDWDoLx8gSqtraCivsqgHwxhHRE/vWnXXGEdPprAru+MTdyuH1\n\tG53fIWiC5GrrN6ezZ8GfXrheK9nnfOhMQDndGQ7c=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 5 Oct 2020 13:46:45 +0300", "Message-Id": "<20201005104649.10812-12-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 11/15] 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": "From: Jacopo Mondi <jacopo@jmondi.org>\n\nLoop over the CameraStream instances and use their interface to perform\nCameraStream configuration after the Camera::configure().\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 10 ++++------\n src/android/camera_stream.cpp | 4 ++--\n src/android/camera_stream.h | 3 ++-\n 3 files changed, 8 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 537883b63f15..62307726aea9 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1298,17 +1298,15 @@ 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->streamConfiguration();\n+\tfor (CameraStream &cameraStream : streams_) {\n+\t\tcamera3_stream_t *stream = cameraStream.androidStream();\n \n-\t\tint ret = cameraStream->configure(cfg);\n+\t\tint ret = cameraStream.configure();\n \t\tif (ret)\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\tstream->max_buffers = cameraStream.streamConfiguration().bufferCount;\n \t}\n \n \treturn 0;\ndiff --git a/src/android/camera_stream.cpp b/src/android/camera_stream.cpp\nindex 76e7d240f4e7..dbde1e786300 100644\n--- a/src/android/camera_stream.cpp\n+++ b/src/android/camera_stream.cpp\n@@ -56,10 +56,10 @@ const Size &CameraStream::size() const\n \treturn streamConfiguration().size;\n }\n \n-int CameraStream::configure(const libcamera::StreamConfiguration &cfg)\n+int CameraStream::configure()\n {\n \tif (encoder_) {\n-\t\tint ret = encoder_->configure(cfg);\n+\t\tint ret = encoder_->configure(streamConfiguration());\n \t\tif (ret)\n \t\t\treturn ret;\n \t}\ndiff --git a/src/android/camera_stream.h b/src/android/camera_stream.h\nindex e399e17b2a2f..c6ff79230b7e 100644\n--- a/src/android/camera_stream.h\n+++ b/src/android/camera_stream.h\n@@ -116,13 +116,14 @@ public:\n \n \tint outputFormat() const { return androidStream_->format; }\n \tType type() const { return type_; }\n+\tcamera3_stream_t *androidStream() const { return androidStream_; }\n \n \tconst libcamera::StreamConfiguration &streamConfiguration() const;\n \tlibcamera::Stream *stream() const;\n \tconst libcamera::PixelFormat &format() const;\n \tconst libcamera::Size &size() const;\n \n-\tint configure(const libcamera::StreamConfiguration &cfg);\n+\tint configure();\n \tint process(libcamera::FrameBuffer *source,\n \t\t MappedCamera3Buffer *dest,\n \t\t CameraMetadata *metadata);\n", "prefixes": [ "libcamera-devel", "11/15" ] }