Patch Detail
Show a patch.
GET /api/1.1/patches/13744/?format=api
{ "id": 13744, "url": "https://patchwork.libcamera.org/api/1.1/patches/13744/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13744/", "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": "<20210907194107.803730-14-jacopo@jmondi.org>", "date": "2021-09-07T19:41:03", "name": "[libcamera-devel,v2,13/17] android: Populate streams and duration in the same loop", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "0fe2dae41a5264a7a4fcf0abfc1aa42f508393e4", "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/13744/mbox/", "series": [ { "id": 2492, "url": "https://patchwork.libcamera.org/api/1.1/series/2492/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2492", "date": "2021-09-07T19:40:50", "name": "IPU3 control info update and HAL frame durations", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2492/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13744/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13744/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 D9397BDB1D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 7 Sep 2021 19:40:43 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B5A7069185;\n\tTue, 7 Sep 2021 21:40:43 +0200 (CEST)", "from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CC1756916D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 7 Sep 2021 21:40:39 +0200 (CEST)", "(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 00D3C240002;\n\tTue, 7 Sep 2021 19:40:38 +0000 (UTC)" ], "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 7 Sep 2021 21:41:03 +0200", "Message-Id": "<20210907194107.803730-14-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.32.0", "In-Reply-To": "<20210907194107.803730-1-jacopo@jmondi.org>", "References": "<20210907194107.803730-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 13/17] android: Populate streams and\n\tduration in the same loop", "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>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "The ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS and\nANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS static metadata are\npopulated by looping on the streamConfigurations_ vector.\n\nUnify them in a single loop to avoid repeating it.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\nReviewed-by: Paul Elder <paul.elder@ideasonboard.com>\nReviewed-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n src/android/camera_capabilities.cpp | 23 ++++++++++-------------\n 1 file changed, 10 insertions(+), 13 deletions(-)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex ba800b545b9d..194ede866806 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -1257,7 +1257,9 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t\t\t maxZoom);\n \n \tstd::vector<uint32_t> availableStreamConfigurations;\n+\tstd::vector<int64_t> minFrameDurations;\n \tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);\n+\tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n \tfor (const auto &entry : streamConfigurations_) {\n \t\t/*\n \t\t * Filter out YUV streams not capable of running at 30 FPS.\n@@ -1274,12 +1276,19 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\tif (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB && fps < 30)\n \t\t\tcontinue;\n \n+\t\t/* Stream configuration map. */\n \t\tavailableStreamConfigurations.push_back(entry.androidFormat);\n \t\tavailableStreamConfigurations.push_back(entry.resolution.width);\n \t\tavailableStreamConfigurations.push_back(entry.resolution.height);\n \t\tavailableStreamConfigurations.push_back(\n \t\t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS_OUTPUT);\n \n+\t\t/* Per-stream durations. */\n+\t\tminFrameDurations.push_back(entry.androidFormat);\n+\t\tminFrameDurations.push_back(entry.resolution.width);\n+\t\tminFrameDurations.push_back(entry.resolution.height);\n+\t\tminFrameDurations.push_back(entry.minFrameDurationNsec);\n+\n \t\tLOG(HAL, Debug)\n \t\t\t<< \"Output Stream: \" << utils::hex(entry.androidFormat)\n \t\t\t<< \" (\" << entry.resolution.width << \"x\"\n@@ -1287,22 +1296,10 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t\t<< entry.minFrameDurationNsec << \"]\"\n \t\t\t<< \"@\" << fps;\n \t}\n+\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n \t\t\t\t availableStreamConfigurations);\n \n-\tstd::vector<int64_t> minFrameDurations;\n-\tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n-\tfor (const auto &entry : streamConfigurations_) {\n-\t\tunsigned int fps = static_cast<unsigned int>\n-\t\t\t\t (floor(1e9 / entry.minFrameDurationNsec + 0.05f));\n-\t\tif (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB && fps < 30)\n-\t\t\tcontinue;\n-\n-\t\tminFrameDurations.push_back(entry.androidFormat);\n-\t\tminFrameDurations.push_back(entry.resolution.width);\n-\t\tminFrameDurations.push_back(entry.resolution.height);\n-\t\tminFrameDurations.push_back(entry.minFrameDurationNsec);\n-\t}\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n \t\t\t\t minFrameDurations);\n \n", "prefixes": [ "libcamera-devel", "v2", "13/17" ] }