NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: pipeline: simple: Store sensor resolution in configuration

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2022-04-07 14:12:15 +03:00
parent 6984f07c0e
commit 5fe1f00f19
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libcamera/pipeline/simple/simple.cpp
View file

@ -225,6 +225,7 @@ public:
struct Configuration { struct Configuration {
uint32_t code; uint32_t code;
Size sensorSize;
PixelFormat captureFormat; PixelFormat captureFormat;
Size captureSize; Size captureSize;
std::vector<PixelFormat> outputFormats; std::vector<PixelFormat> outputFormats;
@ -542,6 +543,7 @@ void SimpleCameraData::tryPipeline(unsigned int code, const Size &size)
Configuration config; Configuration config;
config.code = code; config.code = code;
config.sensorSize = size;
config.captureFormat = pixelFormat; config.captureFormat = pixelFormat;
config.captureSize = format.size; config.captureSize = format.size;
@ -943,7 +945,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
const SimpleCameraData::Configuration *pipeConfig = config->pipeConfig(); const SimpleCameraData::Configuration *pipeConfig = config->pipeConfig();
V4L2SubdeviceFormat format{}; V4L2SubdeviceFormat format{};
format.mbus_code = pipeConfig->code; format.mbus_code = pipeConfig->code;
format.size = data->sensor_->resolution(); format.size = pipeConfig->sensorSize;
ret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat); ret = data->setupFormats(&format, V4L2Subdevice::ActiveFormat);
if (ret < 0) if (ret < 0)