PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: ipa: Merge controls and v4l2controls in IPAOperationData

Browse Source 
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>
This commit is contained in:
Laurent Pinchart
2019-10-11 01:25:27 +03:00
parent 343978af0b
commit ce739e616c
4 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/ipa/ipa_interface.h
View File

@@ -33,7 +33,6 @@ struct IPAOperationData {
unsigned int operation;
std::vector<uint32_t> data;
std::vector<ControlList> controls;
std::vector<V4L2ControlList> v4l2controls;
};
class IPAInterface

2
src/ipa/rkisp1/rkisp1.cpp
View File

@@ -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);
}

8
src/libcamera/ipa_interface.cpp
View File

@@ -120,14 +120,6 @@ namespace libcamera {
* by the IPA protocol.
*/
/**
* \var IPAOperationData::v4l2controls
* \brief Operation V4L2 controls data
*
* The interpretation and position of different values in the array are defined
* by the IPA protocol.
*/
/**
* \class IPAInterface
* \brief Interface for IPA implementation

6
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View File

@@ -324,7 +324,7 @@ RkISP1FrameInfo *RkISP1Frames::find(Request *request)
class RkISP1ActionSetSensor : public FrameAction
{
public:
RkISP1ActionSetSensor(unsigned int frame, CameraSensor *sensor, V4L2ControlList controls)
RkISP1ActionSetSensor(unsigned int frame, CameraSensor *sensor, const ControlList &controls)
: FrameAction(frame, SetSensor), sensor_(sensor), controls_(controls) {}
protected:
@@ -335,7 +335,7 @@ protected:
private:
CameraSensor *sensor_;
V4L2ControlList controls_;
ControlList controls_;
};
class RkISP1ActionQueueBuffers : public FrameAction
@@ -387,7 +387,7 @@ void RkISP1CameraData::queueFrameAction(unsigned int frame,
{
switch (action.operation) {
case RKISP1_IPA_ACTION_V4L2_SET: {
V4L2ControlList controls = action.v4l2controls[0];
const ControlList &controls = action.controls[0];
timeline_.scheduleAction(utils::make_unique<RkISP1ActionSetSensor>(frame,
sensor_,
controls));