Patch Detail
Show a patch.
GET /api/1.1/patches/8558/?format=api
{ "id": 8558, "url": "https://patchwork.libcamera.org/api/1.1/patches/8558/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8558/", "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": "<20200702213654.2129054-4-kieran.bingham@ideasonboard.com>", "date": "2020-07-02T21:36:48", "name": "[libcamera-devel,v2,3/9] android: camera_device: Support multiple stream configurations", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "201d56f8f788fd08b0c2b8111f5a38b4b8b444cb", "submitter": { "id": 4, "url": "https://patchwork.libcamera.org/api/1.1/people/4/?format=api", "name": "Kieran Bingham", "email": "kieran.bingham@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/8558/mbox/", "series": [ { "id": 1073, "url": "https://patchwork.libcamera.org/api/1.1/series/1073/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1073", "date": "2020-07-02T21:36:45", "name": "android: Multi-stream support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1073/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8558/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8558/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 20C24BE905\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 2 Jul 2020 21:37:06 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3922860CAE;\n\tThu, 2 Jul 2020 23:37:05 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D580F60C57\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 2 Jul 2020 23:37:03 +0200 (CEST)", "from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 78DA59CB;\n\tThu, 2 Jul 2020 23:37:03 +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=\"J/U30J7Y\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593725823;\n\tbh=nL5+T7KPz0mehrsJeDuwJ9jTjqay9rR1PgfhEJM22NQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=J/U30J7YsLxzqp7LVnVVAYIM9eJnl8HUcPnlRjWGZ8w8xlrRHUAVIEaa5pVEblVTw\n\tIhAVuLv5AocerSHxiLVmRsIjm8CWn8EVqCoATFBnoBvSOaq55XudkUVqkzeE4kAyqB\n\tsLRf1+ZX6wQ8Tgl+JDDjgKad/6ZBgCQU8h5OkOHo=", "From": "Kieran Bingham <kieran.bingham@ideasonboard.com>", "To": "libcamera devel <libcamera-devel@lists.libcamera.org>", "Date": "Thu, 2 Jul 2020 22:36:48 +0100", "Message-Id": "<20200702213654.2129054-4-kieran.bingham@ideasonboard.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>", "References": "<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 3/9] android: camera_device: Support\n\tmultiple stream configurations", "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": "Create an initial Camera Configuration using an empty role set, and\npopulate the StreamConfigurations manually from each of the streams\ngiven by the Android camera3_stream_configuration_t stream_list.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/android/camera_device.cpp | 51 +++++++++++++++++------------------\n 1 file changed, 25 insertions(+), 26 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex b9031ff0c2a4..03dcdd520794 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -942,6 +942,16 @@ PixelFormat CameraDevice::toPixelFormat(int format)\n */\n int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n {\n+\t/*\n+\t * Generate an empty configuration, and construct a StreamConfiguration\n+\t * for each camera3_stream to add to it.\n+\t */\n+\tconfig_ = camera_->generateConfiguration();\n+\tif (!config_) {\n+\t\tLOG(HAL, Error) << \"Failed to generate camera configuration\";\n+\t\treturn -EINVAL;\n+\t}\n+\n \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n \n@@ -953,35 +963,18 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\t\t << \", height: \" << stream->height\n \t\t\t << \", format: \" << utils::hex(stream->format)\n \t\t\t << \" (\" << format.toString() << \")\";\n-\t}\n \n-\t/* Only one stream is supported. */\n-\tif (stream_list->num_streams != 1) {\n-\t\tLOG(HAL, Error) << \"Only one stream supported\";\n-\t\treturn -EINVAL;\n-\t}\n-\tcamera3_stream_t *camera3Stream = stream_list->streams[0];\n+\t\tif (!format.isValid())\n+\t\t\treturn -EINVAL;\n \n-\t/* Translate Android format code to libcamera pixel format. */\n-\tPixelFormat format = toPixelFormat(camera3Stream->format);\n-\tif (!format.isValid())\n-\t\treturn -EINVAL;\n+\t\tStreamConfiguration streamConfiguration;\n \n-\t/*\n-\t * Hardcode viewfinder role, replacing the generated configuration\n-\t * parameters with the ones requested by the Android framework.\n-\t */\n-\tStreamRoles roles = { StreamRole::Viewfinder };\n-\tconfig_ = camera_->generateConfiguration(roles);\n-\tif (!config_ || config_->empty()) {\n-\t\tLOG(HAL, Error) << \"Failed to generate camera configuration\";\n-\t\treturn -EINVAL;\n-\t}\n+\t\tstreamConfiguration.size.width = stream->width;\n+\t\tstreamConfiguration.size.height = stream->height;\n+\t\tstreamConfiguration.pixelFormat = format;\n \n-\tStreamConfiguration *streamConfiguration = &config_->at(0);\n-\tstreamConfiguration->size.width = camera3Stream->width;\n-\tstreamConfiguration->size.height = camera3Stream->height;\n-\tstreamConfiguration->pixelFormat = format;\n+\t\tconfig_->addConfiguration(streamConfiguration);\n+\t}\n \n \tswitch (config_->validate()) {\n \tcase CameraConfiguration::Valid:\n@@ -996,7 +989,13 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\treturn -EINVAL;\n \t}\n \n-\tcamera3Stream->max_buffers = streamConfiguration->bufferCount;\n+\tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n+\t\tcamera3_stream_t *stream = stream_list->streams[i];\n+\t\tStreamConfiguration &streamConfiguration = config_->at(i);\n+\n+\t\t/* Use the bufferCount confirmed by the validation process. */\n+\t\tstream->max_buffers = streamConfiguration.bufferCount;\n+\t}\n \n \t/*\n \t * Once the CameraConfiguration has been adjusted/validated\n", "prefixes": [ "libcamera-devel", "v2", "3/9" ] }