Patch Detail
Show a patch.
GET /api/patches/9441/?format=api
{ "id": 9441, "url": "https://patchwork.libcamera.org/api/patches/9441/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9441/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20200902104730.43451-5-jacopo@jmondi.org>", "date": "2020-09-02T10:47:29", "name": "[libcamera-devel,4/5] android: camera_device: Break out size calculation", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "fb4597e59cc3cce5eebc169520d9e0ad2e9b53e8", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9441/mbox/", "series": [ { "id": 1255, "url": "https://patchwork.libcamera.org/api/series/1255/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1255", "date": "2020-09-02T10:47:25", "name": "android: camera_device: List JPEG/RAW correct resolutions", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1255/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9441/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9441/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 18C72BF019\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 2 Sep 2020 10:44:01 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E5439629B2;\n\tWed, 2 Sep 2020 12:44:00 +0200 (CEST)", "from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 32CA8628EE\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 2 Sep 2020 12:43: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 relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 4942440003;\n\tWed, 2 Sep 2020 10:43:58 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 2 Sep 2020 12:47:29 +0200", "Message-Id": "<20200902104730.43451-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20200902104730.43451-1-jacopo@jmondi.org>", "References": "<20200902104730.43451-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 4/5] android: camera_device: Break out\n\tsize calculation", "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": "tfiga@google.com, hiroh@google.com", "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": "As the RAW stream sizes needs to be calculated differently from the\nprocessed one, break out from the initializeStreamConfigurations()\nfunction the procedure to calculate the processed (RGB/YUV) resolutions\nin order to prepare for RAW sizes calculation.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 55 ++++++++++++++++++++++++-----------\n src/android/camera_device.h | 5 ++++\n 2 files changed, 43 insertions(+), 17 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 493d6cecde72..765c3292e4f3 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -283,6 +283,37 @@ int CameraDevice::initialize()\n \treturn ret;\n }\n \n+std::vector<Size> CameraDevice::listProcessedResolutions(CameraConfiguration *cameraConfig,\n+\t\t\t\t\t\t\t const PixelFormat &pixelFormat,\n+\t\t\t\t\t\t\t const std::vector<Size> &resolutions)\n+{\n+\tstd::vector<Size> supportedResolutions;\n+\n+\tStreamConfiguration &cfg = cameraConfig->at(0);\n+\tfor (const Size &res : resolutions) {\n+\t\tcfg.pixelFormat = pixelFormat;\n+\t\tcfg.size = res;\n+\n+\t\tstd::stringstream ss;\n+\t\tss << \"Tested (\" << res.toString() << \")[\"\n+\t\t << pixelFormat.toString() << \"]: \";\n+\n+\t\tCameraConfiguration::Status status = cameraConfig->validate();\n+\t\tif (status != CameraConfiguration::Valid) {\n+\t\t\tss << \" not supported\";\n+\t\t\tLOG(HAL, Debug) << ss.str();\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tss << \" supported\";\n+\t\tLOG(HAL, Debug) << ss.str();\n+\n+\t\tsupportedResolutions.push_back(res);\n+\t}\n+\n+\treturn supportedResolutions;\n+}\n+\n /*\n * Initialize the format conversion map to translate from Android format\n * identifier to libcamera pixel formats and fill in the list of supported\n@@ -435,24 +466,14 @@ int CameraDevice::initializeStreamConfigurations()\n \t\t\t\t<< camera3Format.name << \" to: \"\n \t\t\t\t<< mappedFormat.toString();\n \n-\t\tfor (const Size &res : cameraResolutions) {\n-\t\t\tcfg.pixelFormat = mappedFormat;\n-\t\t\tcfg.size = res;\n-\n-\t\t\tstd::stringstream ss;\n-\t\t\tss << \"Testing (\" << res.toString() << \")[\"\n-\t\t\t << mappedFormat.toString() << \"]: \";\n-\n-\t\t\tCameraConfiguration::Status status = cameraConfig->validate();\n-\t\t\tif (status != CameraConfiguration::Valid) {\n-\t\t\t\tss << \" not supported\";\n-\t\t\t\tLOG(HAL, Debug) << ss.str();\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\n-\t\t\tss << \" supported\";\n-\t\t\tLOG(HAL, Debug) << ss.str();\n+\t\tconst PixelFormatInfo &info = PixelFormatInfo::info(mappedFormat);\n+\t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n+\t\t\tcontinue;\n \n+\t\tstd::vector<Size> resolutions = listProcessedResolutions(cameraConfig.get(),\n+\t\t\t\t\t\t\t\t\t mappedFormat,\n+\t\t\t\t\t\t\t\t\t cameraResolutions);\n+\t\tfor (const Size &res : resolutions) {\n \t\t\tstreamConfigurations_.push_back({ res, androidFormat });\n \n \t\t\t/*\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 3934f194f1b5..18fd5ff03cde 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -93,6 +93,11 @@ private:\n \t};\n \n \tint initializeStreamConfigurations();\n+\tstd::vector<libcamera::Size>\n+\tlistProcessedResolutions(libcamera::CameraConfiguration *cameraConfig,\n+\t\t\t\t const libcamera::PixelFormat &pixelFormat,\n+\t\t\t\t const std::vector<libcamera::Size> &resolutions);\n+\n \tstd::tuple<uint32_t, uint32_t> calculateStaticMetadataSize();\n \tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n", "prefixes": [ "libcamera-devel", "4/5" ] }