summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-04-07 14:12:15 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2022-06-16 12:03:50 +0300
commit5fe1f00f197ed2d8dbfe3baf0d147ad610345c3c (patch)
tree511b42a91175c569edf2f45d6b02e669a4d05f0e /src
parent6984f07c0ea8a2ccff349c8fc1890d0b290cc4a6 (diff)
libcamera: pipeline: simple: Store sensor resolution in configuration
When enumerating the supported configurations, store the corresponding sensor resolution in the SimpleCameraData::Configuration structure and use it when configuring the camera, instead of hardcoding the sensor full resolution. This prepares for support of downscaling in the camera sensor. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Reviewed-by: Dorota Czaplejewicz <dorota.czaplejewicz@puri.sm> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/pipeline/simple/simple.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp
index 3c90bdec..8c48162d 100644
--- a/src/libcamera/pipeline/simple/simple.cpp
+++ b/src/libcamera/pipeline/simple/simple.cpp
@@ -225,6 +225,7 @@ public:
struct Configuration {
uint32_t code;
+ Size sensorSize;
PixelFormat captureFormat;
Size captureSize;
std::vector<PixelFormat> outputFormats;
@@ -542,6 +543,7 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)
Configuration config;
config.code = code;
+ config.sensorSize = size;
config.captureFormat = pixelFormat;
config.captureSize = format.size;
@@ -943,7 +945,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
const SimpleCameraData::Configuration *pipeConfig = config->pipeConfig();
V4L2SubdeviceFormat format{};
format.mbus_code = pipeConfig->code;
- format.size = data->sensor_->resolution();
+ format.size = pipeConfig->sensorSize;
ret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat);
if (ret < 0)