summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNaushir Patuck <naush@raspberrypi.com>2021-03-23 14:36:10 +0000
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-03-23 18:43:59 +0200
commit787852a240ae00a5574e7af9341460cec92ce04a (patch)
treeb4e3e1746aa28ceecb32bf36eebbb187008e5cbc /include
parentb876c64613293bdf7735f761bf3281ec2a55a3bb (diff)
ipa: raspberrypi: Rationalise parameters to ipa::configure()
Rename ConfigInput to IPAConfig to be more consistent with the naming, and remove ConfigInput::op, as it is never used. Replace ConfigOutput with a ControlList type, as that is the only return type from ipa::configure(). 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 'include')
-rw-r--r--include/libcamera/ipa/raspberrypi.mojom15
1 files changed, 5 insertions, 10 deletions
diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom
index 55824eeb..f38c2261 100644
--- a/include/libcamera/ipa/raspberrypi.mojom
+++ b/include/libcamera/ipa/raspberrypi.mojom
@@ -29,16 +29,11 @@ struct ISPConfig {
ControlList controls;
};
-struct ConfigInput {
- uint32 op;
+struct IPAConfig {
uint32 transform;
FileDescriptor lsTableHandle;
};
-struct ConfigOutput {
- ControlList controls;
-};
-
struct StartConfig {
ControlList controls;
int32 dropFrameCount;
@@ -56,7 +51,7 @@ interface IPARPiInterface {
* \param[in] streamConfig Configuration of all active streams
* \param[in] entityControls Controls provided by the pipeline entities
* \param[in] ipaConfig Pipeline-handler-specific configuration data
- * \param[out] results Pipeline-handler-specific configuration result
+ * \param[out] controls Controls to apply by the pipeline entity
*
* This method shall be called when the camera is configured to inform
* the IPA of the camera's streams and the sensor settings.
@@ -64,14 +59,14 @@ interface IPARPiInterface {
* The \a sensorInfo conveys information about the camera sensor settings that
* the pipeline handler has selected for the configuration.
*
- * The \a ipaConfig and \a results parameters carry data passed by the
+ * The \a ipaConfig and \a controls parameters carry data passed by the
* pipeline handler to the IPA and back.
*/
configure(CameraSensorInfo sensorInfo,
map<uint32, IPAStream> streamConfig,
map<uint32, ControlInfoMap> entityControls,
- ConfigInput ipaConfig)
- => (int32 ret, ConfigOutput results);
+ IPAConfig ipaConfig)
+ => (int32 ret, ControlList controls);
/**
* \fn mapBuffers()