{"id":9584,"url":"https://patchwork.libcamera.org/api/patches/9584/?format=json","web_url":"https://patchwork.libcamera.org/patch/9584/","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":"<20200912101129.12625-5-jacopo@jmondi.org>","date":"2020-09-12T10:11:23","name":"[libcamera-devel,v4,04/10] android: camera_device: Break out size calculation","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4b29a6a75515b0a4dac85c5b277ececb8458b33d","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9584/mbox/","series":[{"id":1287,"url":"https://patchwork.libcamera.org/api/series/1287/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1287","date":"2020-09-12T10:11:19","name":"android: camera_device: Fix JPEG/RAW sizes","version":4,"mbox":"https://patchwork.libcamera.org/series/1287/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9584/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9584/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 514CEC3B5B\n\tfor ;\n\tSat, 12 Sep 2020 10:08:02 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2AAB762D5B;\n\tSat, 12 Sep 2020 12:08:02 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 925B262D27\n\tfor ;\n\tSat, 12 Sep 2020 12:08:00 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id DBD1E1BF203;\n\tSat, 12 Sep 2020 10:07:58 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 12 Sep 2020 12:11:23 +0200","Message-Id":"<20200912101129.12625-5-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200912101129.12625-1-jacopo@jmondi.org>","References":"<20200912101129.12625-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 04/10] android: camera_device: Break\n\tout size calculation","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","Cc":"hanlinchen@chromium.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"As the RAW stream sizes needs to be calculated differently from the\nprocessed one, break out the procedure to calculate the processed\n(RGB/YUV) resolutions from initializeStreamConfigurations() in order to\nprepare for RAW sizes calculation.\n\nReviewed-by: Hirokazu Honda \nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 42 ++++++++++++++++++++++++-----------\n src/android/camera_device.h | 5 +++++\n 2 files changed, 34 insertions(+), 13 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex d3a53c948ea8..0386287dc39d 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -289,6 +289,31 @@ int CameraDevice::initialize()\n \treturn ret;\n }\n \n+std::vector CameraDevice::getYUVResolutions(CameraConfiguration *cameraConfig,\n+\t\t\t\t\t\t const PixelFormat &pixelFormat,\n+\t\t\t\t\t\t const std::vector &resolutions)\n+{\n+\tstd::vector 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\tCameraConfiguration::Status status = cameraConfig->validate();\n+\t\tif (status != CameraConfiguration::Valid) {\n+\t\t\tLOG(HAL, Debug) << cfg.toString() << \" not supported\";\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\tLOG(HAL, Debug) << cfg.toString() << \" supported\";\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@@ -433,19 +458,10 @@ 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\tCameraConfiguration::Status status = cameraConfig->validate();\n-\t\t\tif (status != CameraConfiguration::Valid) {\n-\t\t\t\tLOG(HAL, Debug) << cfg.toString()\n-\t\t\t\t\t\t<< \" not supported\";\n-\t\t\t\tcontinue;\n-\t\t\t}\n-\n-\t\t\tLOG(HAL, Debug) << cfg.toString() << \" supported\";\n-\n+\t\tstd::vector resolutions = getYUVResolutions(cameraConfig.get(),\n+\t\t\t\t\t\t\t\t mappedFormat,\n+\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..1ff43327bab1 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\n+\tgetYUVResolutions(libcamera::CameraConfiguration *cameraConfig,\n+\t\t\t const libcamera::PixelFormat &pixelFormat,\n+\t\t\t const std::vector &resolutions);\n+\n \tstd::tuple calculateStaticMetadataSize();\n \tlibcamera::FrameBuffer *createFrameBuffer(const buffer_handle_t camera3buffer);\n \tvoid notifyShutter(uint32_t frameNumber, uint64_t timestamp);\n","prefixes":["libcamera-devel","v4","04/10"]}