summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacopo Mondi <jacopo@jmondi.org>2021-04-19 14:49:12 +0200
committerJacopo Mondi <jacopo@jmondi.org>2021-05-06 15:09:30 +0200
commit131b2096937b070fa9348705996d269db5a74eb1 (patch)
tree2767ee547b74a1c14b4b011436ebb31759b12a8d
parent99de8224366ac40429c27425f7c6d9e9aaf258e5 (diff)
libcamera: raspberrypi: 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 RaspberryPi 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: Naushir Patuck <naush@raspberrypi.com> Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
-rw-r--r--src/libcamera/pipeline/raspberrypi/raspberrypi.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 2a917455..91f44f68 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1312,9 +1312,9 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &
handleStreamBuffer(buffer, &isp_[Isp::Stats]);
- /* Fill the Request metadata buffer with what the IPA has provided */
+ /* Add to the Request metadata buffer what the IPA has provided. */
Request *request = requestQueue_.front();
- request->metadata() = controls;
+ request->metadata().merge(controls);
/*
* Also update the ScalerCrop in the metadata with what we actually