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

ipa: raspberrypi: Rename RPi::ConfigParameters enum values

Browse source 
Rename the enum values to indicate pipeline handler -> IPA actions
(IPA_CONFIG_*) and IPA -> pipeline handler return results (IPA_RESULT_*).
Additionally, provide more descriptive names for these values.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2021-02-01 12:56:32 +00:00 • committed by Laurent Pinchart
parent e09c487b97
commit a08b216ac4
3 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,11 +20,11 @@ namespace RPi {
enum ConfigParameters { enum ConfigParameters {
IPA_CONFIG_LS_TABLE = (1 << 0), IPA_CONFIG_LS_TABLE = (1 << 0),
IPA_CONFIG_STAGGERED_WRITE = (1 << 1), IPA_CONFIG_STARTUP_CTRLS = (1 << 1),
IPA_CONFIG_SENSOR = (1 << 2), IPA_RESULT_CONFIG_FAILED = (1 << 2),
IPA_CONFIG_DROP_FRAMES = (1 << 3), IPA_RESULT_SENSOR_PARAMS = (1 << 3),
IPA_CONFIG_FAILED = (1 << 4), IPA_RESULT_SENSOR_CTRLS = (1 << 4),
IPA_CONFIG_STARTUP = (1 << 5), IPA_RESULT_DROP_FRAMES = (1 << 5),
}; };
enum Operations { enum Operations {

18
src/ipa/raspberrypi/raspberrypi.cpp
View file

@ -170,7 +170,7 @@ int IPARPi::start(const IPAOperationData &data, IPAOperationData *result)
ASSERT(result); ASSERT(result);
result->operation = 0; result->operation = 0;
if (data.operation & RPi::IPA_CONFIG_STARTUP) { if (data.operation & RPi::IPA_CONFIG_STARTUP_CTRLS) {
/* We have been given some controls to action before start. */ /* We have been given some controls to action before start. */
queueRequest(data.controls[0]); queueRequest(data.controls[0]);
} }
@ -188,7 +188,7 @@ int IPARPi::start(const IPAOperationData &data, IPAOperationData *result)
ControlList ctrls(sensorCtrls_); ControlList ctrls(sensorCtrls_);
applyAGC(&agcStatus, ctrls); applyAGC(&agcStatus, ctrls);
result->controls.emplace_back(ctrls); result->controls.emplace_back(ctrls);
result->operation |= RPi::IPA_CONFIG_SENSOR; result->operation |= RPi::IPA_RESULT_SENSOR_CTRLS;
} }
/* /*
@ -236,7 +236,7 @@ int IPARPi::start(const IPAOperationData &data, IPAOperationData *result)
} }
result->data.push_back(dropFrame); result->data.push_back(dropFrame);
result->operation |= RPi::IPA_CONFIG_DROP_FRAMES; result->operation |= RPi::IPA_RESULT_DROP_FRAMES;
firstStart_ = false; firstStart_ = false;
@ -289,7 +289,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
{ {
if (entityControls.size() != 2) { if (entityControls.size() != 2) {
LOG(IPARPI, Error) << "No ISP or sensor controls found."; LOG(IPARPI, Error) << "No ISP or sensor controls found.";
result->operation = RPi::IPA_CONFIG_FAILED; result->operation = RPi::IPA_RESULT_CONFIG_FAILED;
return; return;
} }
@ -300,13 +300,13 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
if (!validateSensorControls()) { if (!validateSensorControls()) {
LOG(IPARPI, Error) << "Sensor control validation failed."; LOG(IPARPI, Error) << "Sensor control validation failed.";
result->operation = RPi::IPA_CONFIG_FAILED; result->operation = RPi::IPA_RESULT_CONFIG_FAILED;
return; return;
} }
if (!validateIspControls()) { if (!validateIspControls()) {
LOG(IPARPI, Error) << "ISP control validation failed."; LOG(IPARPI, Error) << "ISP control validation failed.";
result->operation = RPi::IPA_CONFIG_FAILED; result->operation = RPi::IPA_RESULT_CONFIG_FAILED;
return; return;
} }
@ -325,7 +325,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
if (!helper_) { if (!helper_) {
LOG(IPARPI, Error) << "Could not create camera helper for " LOG(IPARPI, Error) << "Could not create camera helper for "
<< cameraName; << cameraName;
result->operation = RPi::IPA_CONFIG_FAILED; result->operation = RPi::IPA_RESULT_CONFIG_FAILED;
return; return;
} }
@ -342,7 +342,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
result->data.push_back(exposureDelay); /* For VBLANK ctrl */ result->data.push_back(exposureDelay); /* For VBLANK ctrl */
result->data.push_back(sensorMetadata); result->data.push_back(sensorMetadata);
result->operation |= RPi::IPA_CONFIG_STAGGERED_WRITE; result->operation |= RPi::IPA_RESULT_SENSOR_PARAMS;
} }
/* Re-assemble camera mode using the sensor info. */ /* Re-assemble camera mode using the sensor info. */
@ -395,7 +395,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo,
applyAGC(&agcStatus, ctrls); applyAGC(&agcStatus, ctrls);
result->controls.emplace_back(ctrls); result->controls.emplace_back(ctrls);
result->operation |= RPi::IPA_CONFIG_SENSOR; result->operation |= RPi::IPA_RESULT_SENSOR_CTRLS;
} }
lastMode_ = mode_; lastMode_ = mode_;

12
src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
View file

@ -753,7 +753,7 @@ int PipelineHandlerRPi::start(Camera *camera, [[maybe_unused]] ControlList *cont
IPAOperationData ipaData = {}; IPAOperationData ipaData = {};
IPAOperationData result = {}; IPAOperationData result = {};
if (controls) { if (controls) {
ipaData.operation = RPi::IPA_CONFIG_STARTUP; ipaData.operation = RPi::IPA_CONFIG_STARTUP_CTRLS;
ipaData.controls.emplace_back(*controls); ipaData.controls.emplace_back(*controls);
} }
ret = data->ipa_->start(ipaData, &result); ret = data->ipa_->start(ipaData, &result);
@ -765,12 +765,12 @@ int PipelineHandlerRPi::start(Camera *camera, [[maybe_unused]] ControlList *cont
} }
/* Apply any gain/exposure settings that the IPA may have passed back. */ /* Apply any gain/exposure settings that the IPA may have passed back. */
if (result.operation & RPi::IPA_CONFIG_SENSOR) { if (result.operation & RPi::IPA_RESULT_SENSOR_CTRLS) {
ControlList &ctrls = result.controls[0]; ControlList &ctrls = result.controls[0];
data->unicam_[Unicam::Image].dev()->setControls(&ctrls); data->unicam_[Unicam::Image].dev()->setControls(&ctrls);
} }
if (result.operation & RPi::IPA_CONFIG_DROP_FRAMES) { if (result.operation & RPi::IPA_RESULT_DROP_FRAMES) {
/* Configure the number of dropped frames required on startup. */ /* Configure the number of dropped frames required on startup. */
data->dropFrameCount_ = result.data[0]; data->dropFrameCount_ = result.data[0];
} }
@ -1213,13 +1213,13 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig, ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig,
&result); &result);
if (result.operation & RPi::IPA_CONFIG_FAILED) { if (result.operation & RPi::IPA_RESULT_CONFIG_FAILED) {
LOG(RPI, Error) << "IPA configuration failed!"; LOG(RPI, Error) << "IPA configuration failed!";
return -EPIPE; return -EPIPE;
} }
unsigned int resultIdx = 0; unsigned int resultIdx = 0;
if (result.operation & RPi::IPA_CONFIG_STAGGERED_WRITE) { if (result.operation & RPi::IPA_RESULT_SENSOR_PARAMS) {
/* /*
* Setup our delayed control writer with the sensor default * Setup our delayed control writer with the sensor default
* gain and exposure delays. * gain and exposure delays.
@ -1237,7 +1237,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config)
} }
} }
if (result.operation & RPi::IPA_CONFIG_SENSOR) { if (result.operation & RPi::IPA_RESULT_SENSOR_CTRLS) {
ControlList &ctrls = result.controls[0]; ControlList &ctrls = result.controls[0];
unicam_[Unicam::Image].dev()->setControls(&ctrls); unicam_[Unicam::Image].dev()->setControls(&ctrls);
} }