summaryrefslogtreecommitdiff
path: root/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2021-03-23 14:36:09 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-03-23 18:43:59 +0200
commitb876c64613293bdf7735f761bf3281ec2a55a3bb (patch)
treee3ed697485ee719252ab3422c09b55b5403e039f /src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
parent8ccddecc94c20c386e0af2493db0c03eddaa3061 (diff)
ipa: raspberrypi: Rationalise parameters to ipa::start()
Separate out the in and out parameters in ipa::start() as they are not the same. This function now takes in a ControlList and returns out a struct StartConfig which holds a ControlList and drop frame count for the pipeline handler to action. Signed-off-by: Naushir Patuck <naush@raspberrypi.com> Tested-by: David Plowman <david.plowman@raspberrypi.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src/libcamera/pipeline/raspberrypi/raspberrypi.cpp')
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp15
1 files changed, 5 insertions, 10 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index ed8cc4ea..a65d5389 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -815,20 +815,15 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)
data->applyScalerCrop(*controls);
/* Start the IPA. */
- ipa::RPi::StartControls ipaData;
- ipa::RPi::StartControls result;
- if (controls)
- ipaData.controls = *controls;
- data->ipa_->start(ipaData, &result);
+ ipa::RPi::StartConfig startConfig;
+ data->ipa_->start(controls ? *controls : ControlList{}, &startConfig);
/* Apply any gain/exposure settings that the IPA may have passed back. */
- if (!result.controls.empty()) {
- ControlList &ctrls = result.controls;
- data->unicam_[Unicam::Image].dev()->setControls(&ctrls);
- }
+ if (!startConfig.controls.empty())
+ data->unicam_[Unicam::Image].dev()->setControls(&startConfig.controls);
/* Configure the number of dropped frames required on startup. */
- data->dropFrameCount_ = result.dropFrameCount;
+ data->dropFrameCount_ = startConfig.dropFrameCount;
/* We need to set the dropFrameCount_ before queueing buffers. */
ret = queueAllBuffers(camera);