diff options
| author | Naushir Patuck <naush@raspberrypi.com> | 2021-02-01 12:56:32 +0000 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-02-05 00:04:54 +0200 |
| commit | a08b216ac4d34c6ce0ca2fedbde89e5ac0523707 (patch) | |
| tree | b5cbeba53ca8aad1cca3afe85d74834479710f16 /src/libcamera/pipeline/raspberrypi | |
| parent | e09c487b97f8cd78944cc27ea28723622aed080b (diff) | |
ipa: raspberrypi: Rename RPi::ConfigParameters enum values
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>
Diffstat (limited to 'src/libcamera/pipeline/raspberrypi')
| -rw-r--r-- | src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 0f802f6c..ef96f8ca 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -753,7 +753,7 @@ int PipelineHandlerRPi::start(Camera *camera, [[maybe_unused]] ControlList *cont IPAOperationData ipaData = {}; IPAOperationData result = {}; if (controls) { - ipaData.operation = RPi::IPA_CONFIG_STARTUP; + ipaData.operation = RPi::IPA_CONFIG_STARTUP_CTRLS; ipaData.controls.emplace_back(*controls); } 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. */ - if (result.operation & RPi::IPA_CONFIG_SENSOR) { + if (result.operation & RPi::IPA_RESULT_SENSOR_CTRLS) { ControlList &ctrls = result.controls[0]; 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. */ data->dropFrameCount_ = result.data[0]; } @@ -1213,13 +1213,13 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config) ipa_->configure(sensorInfo_, streamConfig, entityControls, ipaConfig, &result); - if (result.operation & RPi::IPA_CONFIG_FAILED) { + if (result.operation & RPi::IPA_RESULT_CONFIG_FAILED) { LOG(RPI, Error) << "IPA configuration failed!"; return -EPIPE; } 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 * 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]; unicam_[Unicam::Image].dev()->setControls(&ctrls); } |