@@ -1128,10 +1128,7 @@ void PipelineHandlerISI::bufferReady(FrameBuffer *buffer)
Request *request = buffer->request();
/* Record the sensor's timestamp in the request metadata. */
- ControlList &metadata = request->_d()->metadata();
- if (!metadata.contains(controls::SensorTimestamp.id()))
- metadata.set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
completeBuffer(request, buffer);
if (request->hasPendingBuffers())
@@ -1254,7 +1254,7 @@ void IPU3CameraData::metadataReady(unsigned int id, const ControlList &metadata)
return;
Request *request = info->request;
- request->_d()->metadata().merge(metadata);
+ pipe()->metadataAvailable(request, metadata);
info->metadataProcessed = true;
if (frameInfos_.tryComplete(info))
@@ -1281,12 +1281,14 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)
pipe()->completeBuffer(request, buffer);
- request->_d()->metadata().set(controls::draft::PipelineDepth, 3);
+ pipe()->metadataAvailable(request, controls::draft::PipelineDepth, 3);
+
/* \todo Actually apply the scaler crop region to the ImgU. */
const auto &scalerCrop = request->controls().get(controls::ScalerCrop);
if (scalerCrop)
cropRegion_ = *scalerCrop;
- request->_d()->metadata().set(controls::ScalerCrop, cropRegion_);
+
+ pipe()->metadataAvailable(request, controls::ScalerCrop, cropRegion_);
if (frameInfos_.tryComplete(info))
pipe()->completeRequest(request);
@@ -1326,8 +1328,7 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)
* \todo The sensor timestamp should be better estimated by connecting
* to the V4L2Device::frameStart signal.
*/
- request->_d()->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
info->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);
@@ -1421,8 +1422,7 @@ void IPU3CameraData::frameStart(uint32_t sequence)
return;
}
- request->_d()->metadata().set(controls::draft::TestPatternMode,
- *testPatternMode);
+ pipe()->metadataAvailable(request, controls::draft::TestPatternMode, *testPatternMode);
}
REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3, "ipu3")
@@ -1528,7 +1528,7 @@ void PipelineHandlerMaliC55::statsProcessed(unsigned int requestId,
MaliC55FrameInfo &frameInfo = frameInfoMap_[requestId];
frameInfo.statsDone = true;
- frameInfo.request->_d()->metadata().merge(metadata);
+ metadataAvailable(frameInfo.request, metadata);
tryComplete(&frameInfo);
}
@@ -507,7 +507,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta
if (!info)
return;
- info->request->_d()->metadata().merge(metadata);
+ pipe()->metadataAvailable(info->request, metadata);
info->metadataProcessed = true;
pipe()->tryCompleteRequest(info);
@@ -1645,8 +1645,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)
* \todo The sensor timestamp should be better estimated by connecting
* to the V4L2Device::frameStart signal.
*/
- request->_d()->metadata().set(controls::SensorTimestamp,
- metadata.timestamp);
+ metadataAvailable(request, controls::SensorTimestamp, metadata.timestamp);
if (isRaw_) {
const ControlList &ctrls =
@@ -1688,7 +1687,10 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)
return;
}
- dewarper_->populateMetadata(&data->mainPathStream_, request->_d()->metadata());
+ // FIXME: !!!!
+ ControlList meta;
+ dewarper_->populateMetadata(&data->mainPathStream_, meta);
+ metadataAvailable(request, meta);
}
void PipelineHandlerRkISP1::dewarpBufferReady(FrameBuffer *buffer)
@@ -1235,7 +1235,7 @@ void CameraData::metadataReady(const ControlList &metadata)
/* Add to the Request metadata buffer what the IPA has provided. */
/* Last thing to do is to fill up the request metadata. */
Request *request = requestQueue_.front();
- request->_d()->metadata().merge(metadata);
+ pipe()->metadataAvailable(request, metadata);
/*
* Inform the sensor of the latest colour gains if it has the
@@ -1505,24 +1505,24 @@ void CameraData::checkRequestCompleted()
void CameraData::fillRequestMetadata(const ControlList &bufferControls, Request *request)
{
- if (auto x = bufferControls.get(controls::SensorTimestamp))
- request->_d()->metadata().set(controls::SensorTimestamp, *x);
- if (auto x = bufferControls.get(controls::FrameWallClock))
- request->_d()->metadata().set(controls::FrameWallClock, *x);
-
- if (cropParams_.size()) {
- std::vector<Rectangle> crops;
-
- for (auto const &[k, v] : cropParams_)
- crops.push_back(scaleIspCrop(v.ispCrop));
-
- request->_d()->metadata().set(controls::ScalerCrop, crops[0]);
- if (crops.size() > 1) {
- request->_d()->metadata().set(controls::rpi::ScalerCrops,
- Span<const Rectangle>(crops.data(),
- crops.size()));
+ pipe()->metadataAvailable(request, [&](auto set) {
+ if (auto x = bufferControls.get(controls::SensorTimestamp))
+ set(controls::SensorTimestamp, *x);
+ if (auto x = bufferControls.get(controls::FrameWallClock))
+ set(controls::FrameWallClock, *x);
+
+ if (cropParams_.size()) {
+ std::vector<Rectangle> crops;
+
+ for (auto const &[k, v] : cropParams_)
+ crops.push_back(scaleIspCrop(v.ispCrop));
+
+ set(controls::ScalerCrop, crops[0]);
+
+ if (crops.size() > 1)
+ set(controls::rpi::ScalerCrops, { crops.data(), crops.size() });
}
- }
+ });
}
} /* namespace libcamera */
@@ -940,8 +940,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)
}
if (request)
- request->_d()->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe->metadataAvailable(request, controls::SensorTimestamp,
+ buffer->metadata().timestamp);
/*
* Queue the captured and the request buffer to the converter or Software
@@ -1036,7 +1036,7 @@ void SimpleCameraData::metadataReady(uint32_t frame, const ControlList &metadata
if (!info)
return;
- info->request->_d()->metadata().merge(metadata);
+ pipe()->metadataAvailable(info->request, metadata);
info->metadataProcessed = true;
tryCompleteRequest(info->request);
}
@@ -897,8 +897,7 @@ void UVCCameraData::imageBufferReady(FrameBuffer *buffer)
Request *request = buffer->request();
/* \todo Use the UVC metadata to calculate a more precise timestamp */
- request->_d()->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
pipe()->completeBuffer(request, buffer);
pipe()->completeRequest(request);
@@ -620,8 +620,7 @@ void VimcCameraData::imageBufferReady(FrameBuffer *buffer)
}
/* Record the sensor's timestamp in the request metadata. */
- request->_d()->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
pipe->completeBuffer(request, buffer);
pipe->completeRequest(request);
@@ -366,7 +366,7 @@ int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,
VirtualCameraData *data = cameraData(camera);
const auto timestamp = currentTimestamp();
- request->_d()->metadata().set(controls::SensorTimestamp, timestamp);
+ metadataAvailable(request, controls::SensorTimestamp, timestamp);
data->invokeMethod(&VirtualCameraData::processRequest,
ConnectionTypeQueued, request);