summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/android/camera_capabilities.cpp14
-rw-r--r--src/android/camera_capabilities.h6
2 files changed, 11 insertions, 9 deletions
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 });
diff --git a/src/android/camera_capabilities.h b/src/android/camera_capabilities.h
index e72bf084..e7aa46c0 100644
--- a/src/android/camera_capabilities.h
+++ b/src/android/camera_capabilities.h
@@ -43,10 +43,10 @@ private:
};
std::vector<libcamera::Size>
- getYUVResolutions(const libcamera::PixelFormat &pixelFormat,
- const std::vector<libcamera::Size> &resolutions);
+ initializeYUVResolutions(const libcamera::PixelFormat &pixelFormat,
+ const std::vector<libcamera::Size> &resolutions);
std::vector<libcamera::Size>
- getRawResolutions(const libcamera::PixelFormat &pixelFormat);
+ initializeRawResolutions(const libcamera::PixelFormat &pixelFormat);
int initializeStreamConfigurations();
int initializeStaticMetadata();