diff options
| author | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-11 01:25:27 +0300 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2019-10-13 20:37:57 +0300 |
| commit | ce739e616c42105e5c6f22bf4df5dc19b5e8c8f9 (patch) | |
| tree | 5eff6f85c263a21249bce6600afbc1f5d4be3fcf /src/ipa/rkisp1/rkisp1.cpp | |
| parent | 343978af0b491002dd198b6465d2e3a5fae4e407 (diff) | |
libcamera: ipa: Merge controls and v4l2controls in IPAOperationData
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 <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Tested-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Diffstat (limited to 'src/ipa/rkisp1/rkisp1.cpp')
| -rw-r--r-- | src/ipa/rkisp1/rkisp1.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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<int32_t>(exposure_)); ctrls.set(V4L2_CID_ANALOGUE_GAIN, static_cast<int32_t>(gain_)); - op.v4l2controls.push_back(ctrls); + op.controls.push_back(ctrls); queueFrameAction.emit(frame, op); } |