Patch Detail
Show a patch.
GET /api/1.1/patches/9537/?format=api
{ "id": 9537, "url": "https://patchwork.libcamera.org/api/1.1/patches/9537/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9537/", "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": "<20200908134142.27470-7-jacopo@jmondi.org>", "date": "2020-09-08T13:41:37", "name": "[libcamera-devel,v3,06/11] android: camera_device: Get rid of stream counter", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6b3c2ddbc7b8acab9d359ee1a1ded72965813a9a", "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/9537/mbox/", "series": [ { "id": 1274, "url": "https://patchwork.libcamera.org/api/1.1/series/1274/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1274", "date": "2020-09-08T13:41:31", "name": "android: camera_device: Fix JPEG/RAW sizes", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1274/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9537/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9537/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 AA426BDB1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 8 Sep 2020 13:38:14 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 833F862C9C;\n\tTue, 8 Sep 2020 15:38:14 +0200 (CEST)", "from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9B05B62C30\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 8 Sep 2020 15:38:13 +0200 (CEST)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 0ACE81C000B;\n\tTue, 8 Sep 2020 13:38:11 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 8 Sep 2020 15:41:37 +0200", "Message-Id": "<20200908134142.27470-7-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200908134142.27470-1-jacopo@jmondi.org>", "References": "<20200908134142.27470-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 06/11] android: camera_device: Get rid\n\tof stream counter", "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>", "Cc": "hanlinchen@chromium.org", "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": "Use the size() method of the CameraConfiguration class to retrieve the\nindex of the StreamConfiguration associated with a CameraStream and get\nrid of the custom counter.\n\nAcked-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 | 11 ++---------\n 1 file changed, 2 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 5f4b95987615..562cbb3c415e 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1189,12 +1189,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \tstreams_.clear();\n \tstreams_.reserve(stream_list->num_streams);\n \n-\t/*\n-\t * Track actually created streams, as there may not be a 1:1 mapping of\n-\t * camera3 streams to libcamera streams.\n-\t */\n-\tunsigned int streamIndex = 0;\n-\n \t/* First handle all non-MJPEG streams. */\n \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n@@ -1225,8 +1219,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tstreamConfiguration.pixelFormat = format;\n \n \t\tconfig_->addConfiguration(streamConfiguration);\n-\n-\t\tstreams_[i].index = streamIndex++;\n+\t\tstreams_[i].index = config_->size() - 1;\n \t}\n \n \t/* Now handle MJPEG streams, adding a new stream if required. */\n@@ -1275,7 +1268,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\t\t\t << \" for MJPEG support\";\n \n \t\t\tconfig_->addConfiguration(streamConfiguration);\n-\t\t\tstreams_[i].index = streamIndex++;\n+\t\t\tstreams_[i].index = config_->size() - 1;\n \t\t}\n \t}\n \n", "prefixes": [ "libcamera-devel", "v3", "06/11" ] }