From ce739e616c42105e5c6f22bf4df5dc19b5e8c8f9 Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Fri, 11 Oct 2019 01:25:27 +0300 Subject: libcamera: ipa: Merge controls and v4l2controls in IPAOperationData MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that the V4L2ControlList is merely a helper to construct a ControlList for V4L2 controls, without any data member, all controls can be transferred between pipeline handlers and IPAs using ControlList only. Remove the v4l2controls member for IPAOperationData and use the control member instead. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi Tested-by: Niklas Söderlund Reviewed-by: Niklas Söderlund --- src/ipa/rkisp1/rkisp1.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ipa/rkisp1') diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 69ced840..13059d99 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -215,7 +215,7 @@ void IPARkISP1::setControls(unsigned int frame) V4L2ControlList ctrls(ctrls_); ctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_)); ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast(gain_)); - op.v4l2controls.push_back(ctrls); + op.controls.push_back(ctrls); queueFrameAction.emit(frame, op); } -- cgit v1.2.1