summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>2021-03-16 16:40:22 +0100
committerJean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>2021-03-17 15:04:56 +0100
commit3f6785963d198e1801ecaa203e4075e18485edd0 (patch)
tree47da93d11b535c9bfabd6ecf7f0d526ebe713d86 /src
parent0d0ac3cb132ec5aa1fd7ba7bc0c5b50c139049ba (diff)
libcamera: ipu3: Move ipa configuration from start() to configure()
IPA was configured after all the pipeline devices were started, including IPA itself. Move it at the end of configure() call. Signed-off-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'src')
-rw-r--r--src/libcamera/pipeline/ipu3/ipu3.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp
index 2ea13ec9..bb61ef4a 100644
--- a/src/libcamera/pipeline/ipu3/ipu3.cpp
+++ b/src/libcamera/pipeline/ipu3/ipu3.cpp
@@ -633,6 +633,10 @@ int PipelineHandlerIPU3::configure(Camera *camera, CameraConfiguration *c)
return ret;
}
+ std::map<uint32_t, ControlInfoMap> entityControls;
+ entityControls.emplace(0, data->cio2_.sensor()->controls());
+ data->ipa_->configure(entityControls);
+
return 0;
}
@@ -717,7 +721,6 @@ int PipelineHandlerIPU3::freeBuffers(Camera *camera)
int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlList *controls)
{
- std::map<uint32_t, ControlInfoMap> entityControls;
IPU3CameraData *data = cameraData(camera);
CIO2Device *cio2 = &data->cio2_;
ImgUDevice *imgu = data->imgu_;
@@ -744,9 +747,6 @@ int PipelineHandlerIPU3::start(Camera *camera, [[maybe_unused]] const ControlLis
if (ret)
goto error;
- entityControls.emplace(0, data->cio2_.sensor()->controls());
- data->ipa_->configure(entityControls);
-
return 0;
error: