From d9a68af06d7952089c8d00f6b3dc834c678fc16a Mon Sep 17 00:00:00 2001 From: Jacopo Mondi Date: Mon, 3 May 2021 11:44:18 +0200 Subject: libcamera: ipu3: Merge IPA metadata controls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When a Request is completed upon receiving the IPA produced metadata, they should be merged with the metadata set by the pipeline handler before reporting them to applications. Use ControlList::merge() to collect the IPA produced controls to the request's metadata. Reviewed-by: Hirokazu Honda Reviewed-by: Niklas Söderlund Signed-off-by: Jacopo Mondi --- src/libcamera/pipeline/ipu3/ipu3.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/libcamera/pipeline') diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 88b7bd1e..ade8ffbd 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -1190,11 +1190,8 @@ void IPU3CameraData::queueFrameAction(unsigned int id, if (!info) break; - /* - * \todo Parse the value of the controls returned by the IPA - * in action.controls to register additional metadata. - */ Request *request = info->request; + request->metadata().merge(action.controls); info->metadataProcessed = true; if (frameInfos_.tryComplete(info)) -- cgit v1.2.1