{"id":12965,"url":"https://patchwork.libcamera.org/api/1.1/patches/12965/?format=json","web_url":"https://patchwork.libcamera.org/patch/12965/","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":"<20210715153241.63971-3-jacopo@jmondi.org>","date":"2021-07-15T15:32:40","name":"[libcamera-devel,2/3] android: capabilties: Rationalize get[YUV|Raw]Resolution names","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"916a4fa61017306b9a72083bb4690fcc56b1071c","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/12965/mbox/","series":[{"id":2239,"url":"https://patchwork.libcamera.org/api/1.1/series/2239/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2239","date":"2021-07-15T15:32:38","name":"android: Drive-by cleanups","version":1,"mbox":"https://patchwork.libcamera.org/series/2239/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12965/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12965/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 0C089C3227\n\tfor ;\n\tThu, 15 Jul 2021 15:32:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8A1FF68542;\n\tThu, 15 Jul 2021 17:32:11 +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 408A368538\n\tfor ;\n\tThu, 15 Jul 2021 17:32:08 +0200 (CEST)","(Authenticated sender: jacopo@jmondi.org)\n\tby relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 9D6F3240002;\n\tThu, 15 Jul 2021 15:32:07 +0000 (UTC)"],"From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 15 Jul 2021 17:32:40 +0200","Message-Id":"<20210715153241.63971-3-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20210715153241.63971-1-jacopo@jmondi.org>","References":"<20210715153241.63971-1-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/3] android: capabilties: Rationalize\n\tget[YUV|Raw]Resolution names","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":"The getYUVResolutions() and getRawResolutions() functions are called\nfrom the initializeStreamConfigurations() function, which is called by\ninitialize().\n\nRationalize the function naming scheme by renaming the two functions to\ninitializeYUVResolutions() and initializeRawResolution().\n\nCosmetic change only.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_capabilities.cpp | 14 ++++++++------\n src/android/camera_capabilities.h | 6 +++---\n 2 files changed, 11 insertions(+), 9 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 6543c2bbc6c3..15e54192adff 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -138,8 +138,9 @@ int CameraCapabilities::initialize(std::shared_ptr camera,\n \treturn initializeStaticMetadata();\n }\n \n-std::vector CameraCapabilities::getYUVResolutions(const PixelFormat &pixelFormat,\n-\t\t\t\t\t\t\tconst std::vector &resolutions)\n+std::vector\n+CameraCapabilities::initializeYUVResolutions(const PixelFormat &pixelFormat,\n+\t\t\t\t\t const std::vector &resolutions)\n {\n \tstd::vector supportedResolutions;\n \tstd::unique_ptr cameraConfig =\n@@ -164,7 +165,8 @@ std::vector CameraCapabilities::getYUVResolutions(const PixelFormat &pixel\n \treturn supportedResolutions;\n }\n \n-std::vector CameraCapabilities::getRawResolutions(const libcamera::PixelFormat &pixelFormat)\n+std::vector\n+CameraCapabilities::initializeRawResolutions(const libcamera::PixelFormat &pixelFormat)\n {\n \tstd::unique_ptr cameraConfig =\n \t\tcamera_->generateConfiguration({ StreamRole::Raw });\n@@ -323,10 +325,10 @@ int CameraCapabilities::initializeStreamConfigurations()\n \t\tstd::vector resolutions;\n \t\tconst PixelFormatInfo &info = PixelFormatInfo::info(mappedFormat);\n \t\tif (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)\n-\t\t\tresolutions = getRawResolutions(mappedFormat);\n+\t\t\tresolutions = initializeRawResolutions(mappedFormat);\n \t\telse\n-\t\t\tresolutions = getYUVResolutions(mappedFormat,\n-\t\t\t\t\t\t\tcameraResolutions);\n+\t\t\tresolutions = initializeYUVResolutions(mappedFormat,\n+\t\t\t\t\t\t\t cameraResolutions);\n \n \t\tfor (const Size &res : resolutions) {\n \t\t\tstreamConfigurations_.push_back({ res, androidFormat });\ndiff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h\nindex e72bf084cd65..e7aa46c0a689 100644\n--- a/src/android/camera_capabilities.h\n+++ b/src/android/camera_capabilities.h\n@@ -43,10 +43,10 @@ private:\n \t};\n \n \tstd::vector\n-\tgetYUVResolutions(const libcamera::PixelFormat &pixelFormat,\n-\t\t\t const std::vector &resolutions);\n+\tinitializeYUVResolutions(const libcamera::PixelFormat &pixelFormat,\n+\t\t\t\t const std::vector &resolutions);\n \tstd::vector\n-\tgetRawResolutions(const libcamera::PixelFormat &pixelFormat);\n+\tinitializeRawResolutions(const libcamera::PixelFormat &pixelFormat);\n \tint initializeStreamConfigurations();\n \n \tint initializeStaticMetadata();\n","prefixes":["libcamera-devel","2/3"]}