pipeline: ipa: raspberrypi: Replace entityControls

Replace the legacy entityControls map passed into ipa::configure() with explicit
fields for sensor and ISP controls. This removes any ambiguity over which set of
controls corresponds with specific integer keys.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Nick Hollinghurst <nick.hollinghurst@raspberrypi.com>
Reviewed-by: David Plowman <david.plowman@raspberrypi.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2023-01-23 15:49:23 +00:00 committed by Kieran Bingham
parent d70c38dca8
commit c204a67bae
3 changed files with 9 additions and 19 deletions

View file

@ -36,6 +36,8 @@ struct ISPConfig {
struct IPAConfig {
uint32 transform;
libcamera.SharedFD lsTableHandle;
libcamera.ControlInfoMap sensorControls;
libcamera.ControlInfoMap ispControls;
};
struct IPAConfigResult {
@ -59,7 +61,6 @@ interface IPARPiInterface {
* \fn configure()
* \brief Configure the IPA stream and sensor settings
* \param[in] sensorInfo Camera sensor information
* \param[in] entityControls Controls provided by the pipeline entities
* \param[in] ipaConfig Pipeline-handler-specific configuration data
* \param[out] controls Controls to apply by the pipeline entity
* \param[out] result Other results that the pipeline handler may require
@ -74,7 +75,6 @@ interface IPARPiInterface {
* pipeline handler to the IPA and back.
*/
configure(libcamera.IPACameraSensorInfo sensorInfo,
map<uint32, libcamera.ControlInfoMap> entityControls,
IPAConfig ipaConfig)
=> (int32 ret, libcamera.ControlList controls, IPAConfigResult result);