{"id":8940,"url":"https://patchwork.libcamera.org/api/patches/8940/?format=json","web_url":"https://patchwork.libcamera.org/patch/8940/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20200723173942.98182-3-niklas.soderlund@ragnatech.se>","date":"2020-07-23T17:39:40","name":"[libcamera-devel,2/4] android: camera_device: Use HAL_PIXEL_FORMAT_* defines for formats","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4d9a29b3be5b5ffe93581f47288e48edd804c98c","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/?format=json","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8940/mbox/","series":[{"id":1130,"url":"https://patchwork.libcamera.org/api/series/1130/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1130","date":"2020-07-23T17:39:38","name":"android: camera_device: Improve on format related tags","version":1,"mbox":"https://patchwork.libcamera.org/series/1130/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8940/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8940/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 10546BD878\n\tfor ;\n\tThu, 23 Jul 2020 17:40:53 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3D1C9611AF;\n\tThu, 23 Jul 2020 19:40:52 +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 2732960496\n\tfor ;\n\tThu, 23 Jul 2020 19:40:49 +0200 (CEST)","from bismarck.berto.se (p4fca2eca.dip0.t-ipconnect.de\n\t[79.202.46.202]) by bin-vsp-out-01.atm.binero.net (Halon) with ESMTPA\n\tid a479ae3f-cd0b-11ea-933e-005056917a89;\n\tThu, 23 Jul 2020 19:40:47 +0200 (CEST)"],"X-Halon-ID":"a479ae3f-cd0b-11ea-933e-005056917a89","Authorized-sender":"niklas@soderlund.pp.se","From":"=?utf-8?q?Niklas_S=C3=B6derlund?= ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 23 Jul 2020 19:39:40 +0200","Message-Id":"<20200723173942.98182-3-niklas.soderlund@ragnatech.se>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20200723173942.98182-1-niklas.soderlund@ragnatech.se>","References":"<20200723173942.98182-1-niklas.soderlund@ragnatech.se>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH 2/4] android: camera_device: Use\n\tHAL_PIXEL_FORMAT_* defines for 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":"The documentation says the HAL_PIXEL_FORMAT_* defines shall be used for\nformats instead of ANDROID_SCALER_AVAILABLE_FORMATS_* for the\nANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS and\nANDROID_SCALER_AVAILABLE_MIN_FRAME_DURATIONS tags.\n\nThis have worked in the past as the numerical value of the two sets are\nthe same for the formats supported.\n\nSigned-off-by: Niklas Söderlund \n---\n src/android/camera_device.cpp | 8 ++++----\n src/android/camera_device.h | 2 +-\n 2 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 6e7673583f6a8f85..96dd8d5a99082966 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -317,14 +317,14 @@ int CameraDevice::initializeStreamConfigurations()\n \t\t\t status != CameraConfiguration::Valid)\n \t\t\t\tcontinue;\n \n-\t\t\tstreamConfigurations_.push_back({ res, camera3Format.scalerFormat });\n+\t\t\tstreamConfigurations_.push_back({ res, androidFormat });\n \t\t}\n \t}\n \n \tLOG(HAL, Debug) << \"Collected stream configuration map: \";\n \tfor (const auto &entry : streamConfigurations_)\n \t\tLOG(HAL, Debug) << \"{ \" << entry.resolution.toString() << \" - \"\n-\t\t\t\t<< utils::hex(entry.androidScalerCode) << \" }\";\n+\t\t\t\t<< utils::hex(entry.androidFormat) << \" }\";\n \n \treturn 0;\n }\n@@ -658,7 +658,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstd::vector availableStreamConfigurations;\n \tavailableStreamConfigurations.reserve(streamConfigurations_.size() * 4);\n \tfor (const auto &entry : streamConfigurations_) {\n-\t\tavailableStreamConfigurations.push_back(entry.androidScalerCode);\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@@ -679,7 +679,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstd::vector minFrameDurations;\n \tminFrameDurations.reserve(streamConfigurations_.size() * 4);\n \tfor (const auto &entry : streamConfigurations_) {\n-\t\tminFrameDurations.push_back(entry.androidScalerCode);\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(33333333);\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex 5b8b9c3e26e2871e..00472c21938871a1 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -75,7 +75,7 @@ private:\n \n \tstruct Camera3StreamConfiguration {\n \t\tlibcamera::Size resolution;\n-\t\tint androidScalerCode;\n+\t\tint androidFormat;\n \t};\n \n \tint initializeStreamConfigurations();\n","prefixes":["libcamera-devel","2/4"]}