NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

pipeline: ipa: raspberrypi: Move ControlInfoMap to the IPA

Browse source 
Currently the pipeline handler advertises controls handled by the IPA from a
static ControlInfoMap defined in the raspberrypi.h header. This change removes
this header file, and instead the IPA returns the ControlInfoMap to the pipeline
handler from the ipa::init() function. This is done to allow the IPA to adjust
the limits of the controls based on the sensor mode in a subsequent change.

Bug: https://bugs.libcamera.org/show_bug.cgi?id=83
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.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 2022-06-22 11:20:45 +01:00 • committed by Kieran Bingham
parent 8acfb8494c
commit 53ada24e63
5 changed files with 53 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

55
include/libcamera/ipa/raspberrypi.h
View file

@ -1,55 +0,0 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */
/*
* Copyright (C) 2019-2020, Raspberry Pi Ltd.
*
* raspberrypi.h - Image Processing Algorithm interface for Raspberry Pi
*/
#pragma once
#include <stdint.h>
#include <libcamera/control_ids.h>
#include <libcamera/controls.h>
#ifndef __DOXYGEN__
namespace libcamera {
namespace RPi {
/*
* List of controls handled by the Raspberry Pi IPA
*
* \todo This list will need to be built dynamically from the control
* algorithms loaded by the json file, once this is supported. At that
* point applications should check first whether a control is supported,
* and the pipeline handler may be reverted so that it aborts when an
* unsupported control is encountered.
*/
static const ControlInfoMap Controls({
{ &controls::AeEnable, ControlInfo(false, true) },
{ &controls::ExposureTime, ControlInfo(0, 999999) },
{ &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) },
{ &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) },
{ &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) },
{ &controls::AeExposureMode, ControlInfo(controls::AeExposureModeValues) },
{ &controls::ExposureValue, ControlInfo(-8.0f, 8.0f, 0.0f) },
{ &controls::AwbEnable, ControlInfo(false, true) },
{ &controls::ColourGains, ControlInfo(0.0f, 32.0f) },
{ &controls::AwbMode, ControlInfo(controls::AwbModeValues) },
{ &controls::Brightness, ControlInfo(-1.0f, 1.0f, 0.0f) },
{ &controls::Contrast, ControlInfo(0.0f, 32.0f, 1.0f) },
{ &controls::Saturation, ControlInfo(0.0f, 32.0f, 1.0f) },
{ &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) },
{ &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) },
{ &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },
{ &controls::FrameDurationLimits, ControlInfo(INT64_C(1000), INT64_C(1000000000)) },
{ &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) }
}, controls::controls);
} /* namespace RPi */
} /* namespace libcamera */
#endif /* __DOXYGEN__ */

7
include/libcamera/ipa/raspberrypi.mojom
View file

@ -26,6 +26,11 @@ struct SensorConfig {
uint32 sensorMetadata;
};
struct IPAInitResult {
SensorConfig sensorConfig;
libcamera.ControlInfoMap controlInfo;
};
struct ISPConfig {
uint32 embeddedBufferId;
uint32 bayerBufferId;
@ -50,7 +55,7 @@ struct StartConfig {
interface IPARPiInterface {
init(libcamera.IPASettings settings)
=> (int32 ret, SensorConfig sensorConfig);
=> (int32 ret, IPAInitResult result);
start(libcamera.ControlList controls) => (StartConfig startConfig);
stop();