From 18d61deb3c0aebcf99c9b085f7031cd2f12b4d66 Mon Sep 17 00:00:00 2001
From: Jacopo Mondi <jacopo@jmondi.org>
Date: Wed, 30 Jun 2021 14:29:11 +0200
Subject: android: capabilties: Rationalize get[YUV|Raw]Resolution names

The getYUVResolutions() and getRawResolutions() functions are called
from the initializeStreamConfigurations() function, which is called by
initialize().

Rationalize the function naming scheme by renaming the two functions to
initializeYUVResolutions() and initializeRawResolution().

Cosmetic change only.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/android/camera_capabilities.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/android/camera_capabilities.cpp')

diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp
index 6543c2bb..15e54192 100644
--- a/src/android/camera_capabilities.cpp
+++ b/src/android/camera_capabilities.cpp
@@ -138,8 +138,9 @@ int CameraCapabilities::initialize(std::shared_ptr<libcamera::Camera> camera,
 	return initializeStaticMetadata();
 }
 
-std::vector<Size> CameraCapabilities::getYUVResolutions(const PixelFormat &pixelFormat,
-							const std::vector<Size> &resolutions)
+std::vector<Size>
+CameraCapabilities::initializeYUVResolutions(const PixelFormat &pixelFormat,
+					     const std::vector<Size> &resolutions)
 {
 	std::vector<Size> supportedResolutions;
 	std::unique_ptr<CameraConfiguration> cameraConfig =
@@ -164,7 +165,8 @@ std::vector<Size> CameraCapabilities::getYUVResolutions(const PixelFormat &pixel
 	return supportedResolutions;
 }
 
-std::vector<Size> CameraCapabilities::getRawResolutions(const libcamera::PixelFormat &pixelFormat)
+std::vector<Size>
+CameraCapabilities::initializeRawResolutions(const libcamera::PixelFormat &pixelFormat)
 {
 	std::unique_ptr<CameraConfiguration> cameraConfig =
 		camera_->generateConfiguration({ StreamRole::Raw });
@@ -323,10 +325,10 @@ int CameraCapabilities::initializeStreamConfigurations()
 		std::vector<Size> resolutions;
 		const PixelFormatInfo &info = PixelFormatInfo::info(mappedFormat);
 		if (info.colourEncoding == PixelFormatInfo::ColourEncodingRAW)
-			resolutions = getRawResolutions(mappedFormat);
+			resolutions = initializeRawResolutions(mappedFormat);
 		else
-			resolutions = getYUVResolutions(mappedFormat,
-							cameraResolutions);
+			resolutions = initializeYUVResolutions(mappedFormat,
+							       cameraResolutions);
 
 		for (const Size &res : resolutions) {
 			streamConfigurations_.push_back({ res, androidFormat });
-- 
cgit v1.2.1