{"id":8959,"url":"https://patchwork.libcamera.org/api/1.1/patches/8959/?format=json","web_url":"https://patchwork.libcamera.org/patch/8959/","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":"<20200724090744.508110-2-niklas.soderlund@ragnatech.se>","date":"2020-07-24T09:07:41","name":"[libcamera-devel,v2,1/4] android: camera_device: Remove ANDROID_SCALER_AVAILABLE_FORMATS","commit_ref":"3530614fbf59b83f29bbd618742a6683c4fa244f","pull_url":null,"state":"accepted","archived":false,"hash":"ea343d7fcdeb2965805648af29480d4038d9efe0","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/1.1/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8959/mbox/","series":[{"id":1134,"url":"https://patchwork.libcamera.org/api/1.1/series/1134/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1134","date":"2020-07-24T09:07:40","name":"android: camera_device: Improve on format related tags","version":2,"mbox":"https://patchwork.libcamera.org/series/1134/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8959/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8959/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 7FF86BD86F\n\tfor ;\n\tFri, 24 Jul 2020 09:07:57 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6AB1561212;\n\tFri, 24 Jul 2020 11:07:56 +0200 (CEST)","from bin-mail-out-06.binero.net (bin-mail-out-06.binero.net\n\t[195.74.38.229])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 563C66118A\n\tfor ;\n\tFri, 24 Jul 2020 11:07:54 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA\n\tid 27f69248-cd8d-11ea-8fb8-005056917f90;\n\tFri, 24 Jul 2020 11:07:53 +0200 (CEST)"],"X-Halon-ID":"27f69248-cd8d-11ea-8fb8-005056917f90","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 24 Jul 2020 11:07:41 +0200","Message-Id":"<20200724090744.508110-2-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200724090744.508110-1-niklas.soderlund@ragnatech.se>","References":"<20200724090744.508110-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 1/4] android: camera_device: Remove\n\tANDROID_SCALER_AVAILABLE_FORMATS","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"According to the documentation the tag\nANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS deprecates the\nANDROID_SCALER_AVAILABLE_FORMATS tag. As the HAL implements both tags\nremove the deprecated one.\n\nSigned-off-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 15 ++-------------\n 1 file changed, 2 insertions(+), 13 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 48f8090a93db454d..6e7673583f6a8f85 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -376,7 +376,7 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n \t * \\todo Keep this in sync with the actual number of entries.\n \t * Currently: 50 entries, 647 bytes of static metadata\n \t */\n-\tuint32_t numEntries = 50;\n+\tuint32_t numEntries = 49;\n \tuint32_t byteSize = 647;\n \n \t/*\n@@ -385,10 +385,9 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n \t *\n \t * Each stream configuration entry requires 52 bytes:\n \t * 4 32bits integers for ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS\n-\t * 1 32bits integer for ANDROID_SCALER_AVAILABLE_FORMATS\n \t * 4 64bits integers for ANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS\n \t */\n-\tbyteSize += streamConfigurations_.size() * 52;\n+\tbyteSize += streamConfigurations_.size() * 48;\n \n \treturn std::make_tuple(numEntries, byteSize);\n }\n@@ -656,15 +655,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n \t\t\t\t &maxDigitalZoom, 1);\n \n-\tstd::vector availableStreamFormats;\n-\tavailableStreamFormats.reserve(streamConfigurations_.size());\n-\tstd::transform(streamConfigurations_.begin(), streamConfigurations_.end(),\n-\t\t std::back_inserter(availableStreamFormats),\n-\t\t [](const auto &entry) { return entry.androidScalerCode; });\n-\tstaticMetadata_->addEntry(ANDROID_SCALER_AVAILABLE_FORMATS,\n-\t\t\t\t availableStreamFormats.data(),\n-\t\t\t\t availableStreamFormats.size());\n-\n \tstd::vector availableStreamConfigurations;\n \tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);\n \tfor (const auto &entry : streamConfigurations_) {\n@@ -761,7 +751,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t\tANDROID_LENS_INFO_MINIMUM_FOCUS_DISTANCE,\n \t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n \t\tANDROID_SCALER_AVAILABLE_MAX_DIGITAL_ZOOM,\n-\t\tANDROID_SCALER_AVAILABLE_FORMATS,\n \t\tANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS,\n \t\tANDROID_SCALER_AVAILABLE_STALL_DURATIONS,\n \t\tANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS,\n","prefixes":["libcamera-devel","v2","1/4"]}