summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-04-16 14:40:38 +0200
committerJacopo Mondi <jacopo@jmondi.org>2021-05-06 15:08:56 +0200
commit210c59b6bba51f41d7d0db9a5e6b92536609b382 (patch)
treeedbf4d9e80675331d6d9bb0ccdfd208229d419d2
parentae342991dc6ac4a68893024686da30f93d12ed9e (diff)
libcamera: rkisp1: Do not over-write metadata
When a Request is completed upon receiving the IPA produced metadata, the metadata associated with the Request are over-written, deleting the information set at output buffer completion, such as the SensorTimestamp. This commit applies to the RkISP1 pipeline handler the same change applied to IPU3 in commit 2ee3dd57e2fc ("libcamera: ipu3: Merge IPA metadata controls"). Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--src/libcamera/pipeline/rkisp1/rkisp1.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
index 8d195937..dbdfa252 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp
+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp
@@ -365,7 +365,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta
if (!info)
return;
- info->request->metadata() = metadata;
+ info->request->metadata().merge(metadata);
info->metadataProcessed = true;
pipe->tryCompleteRequest(info->request);