{"id":13740,"url":"https://patchwork.libcamera.org/api/1.1/patches/13740/?format=json","web_url":"https://patchwork.libcamera.org/patch/13740/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","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-10-jacopo@jmondi.org>","date":"2021-09-07T19:40:59","name":"[libcamera-devel,v2,09/17] android: capabilties: Correctly populate STALL durations","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"e3c3e03e637daaf62b99b76436876f3c9a0fa053","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13740/mbox/","series":[{"id":2492,"url":"https://patchwork.libcamera.org/api/1.1/series/2492/?format=json","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/13740/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13740/checks/","tags":{},"headers":{"Return-Path":"","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 ADB82BDB1D\n\tfor ;\n\tTue, 7 Sep 2021 19:40:38 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3E2B569185;\n\tTue, 7 Sep 2021 21:40:38 +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 F292569171\n\tfor ;\n\tTue, 7 Sep 2021 21:40:35 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 2E660240002;\n\tTue, 7 Sep 2021 19:40:34 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 7 Sep 2021 21:40:59 +0200","Message-Id":"<20210907194107.803730-10-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 09/17] android: capabilties: Correctly\n\tpopulate STALL durations","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"We currently hardcode 2560x1920@30FPS as the only stalling frame duration.\n\nThis is of course not correct, and all the required information to\nproperly populate the ANDROID_SCALER_AVAILABLE_STALL_DURATIONS static\nmetadata are available from initializeStaticMetadata().\n\nUse the collected stalling durations and sizes to properly popoulate the\nstatic property.\n\nSigned-off-by: Jacopo Mondi \nReviewed-by: Paul Elder \nReviewed-by: Umang Jain \n---\n src/android/camera_capabilities.cpp | 19 +++++++++++++------\n 1 file changed, 13 insertions(+), 6 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 5d8293843f57..526127176678 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -1265,12 +1265,6 @@ int CameraCapabilities::initializeStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n \t\t\t\t availableStreamConfigurations);\n \n-\tstd::vector availableStallDurations = {\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS_BLOB, 2560, 1920, 33333333,\n-\t};\n-\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n-\t\t\t\t availableStallDurations);\n-\n \tstd::vector minFrameDurations;\n \tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n \tfor (const auto &entry : streamConfigurations_) {\n@@ -1282,6 +1276,19 @@ int CameraCapabilities::initializeStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n \t\t\t\t minFrameDurations);\n \n+\tstd::vector availableStallDurations;\n+\tfor (const auto &entry : streamConfigurations_) {\n+\t\tif (entry.androidFormat != HAL_PIXEL_FORMAT_BLOB)\n+\t\t\tcontinue;\n+\n+\t\tavailableStallDurations.push_back(entry.androidFormat);\n+\t\tavailableStallDurations.push_back(entry.resolution.width);\n+\t\tavailableStallDurations.push_back(entry.resolution.height);\n+\t\tavailableStallDurations.push_back(entry.minFrameDurationNsec);\n+\t}\n+\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n+\t\t\t\t availableStallDurations);\n+\n \tuint8_t croppingType = ANDROID_SCALER_CROPPING_TYPE_CENTER_ONLY;\n \tstaticMetadata_->addEntry(ANDROID_SCALER_CROPPING_TYPE, croppingType);\n \n","prefixes":["libcamera-devel","v2","09/17"]}