@@ -1100,10 +1100,7 @@ void PipelineHandlerISI::bufferReady(FrameBuffer *buffer)
Request *request = buffer->request();
/* Record the sensor's timestamp in the request metadata. */
- ControlList &metadata = request->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())
@@ -1250,7 +1250,7 @@ void IPU3CameraData::metadataReady(unsigned int id, const ControlList &metadata)
return;
Request *request = info->request;
- request->metadata().merge(metadata);
+ pipe()->metadataAvailable(request, metadata);
info->metadataProcessed = true;
if (frameInfos_.tryComplete(info))
@@ -1277,12 +1277,14 @@ void IPU3CameraData::imguOutputBufferReady(FrameBuffer *buffer)
pipe()->completeBuffer(request, buffer);
- request->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->metadata().set(controls::ScalerCrop, cropRegion_);
+
+ pipe()->metadataAvailable(request, controls::ScalerCrop, cropRegion_);
if (frameInfos_.tryComplete(info))
pipe()->completeRequest(request);
@@ -1322,8 +1324,7 @@ void IPU3CameraData::cio2BufferReady(FrameBuffer *buffer)
* \todo The sensor timestamp should be better estimated by connecting
* to the V4L2Device::frameStart signal.
*/
- request->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
info->effectiveSensorControls = delayedCtrls_->get(buffer->metadata().sequence);
@@ -1417,8 +1418,7 @@ void IPU3CameraData::frameStart(uint32_t sequence)
return;
}
- request->metadata().set(controls::draft::TestPatternMode,
- *testPatternMode);
+ pipe()->metadataAvailable(request, controls::draft::TestPatternMode, *testPatternMode);
}
REGISTER_PIPELINE_HANDLER(PipelineHandlerIPU3, "ipu3")
@@ -1523,7 +1523,7 @@ void PipelineHandlerMaliC55::statsProcessed(unsigned int requestId,
MaliC55FrameInfo &frameInfo = frameInfoMap_[requestId];
frameInfo.statsDone = true;
- frameInfo.request->metadata().merge(metadata);
+ metadataAvailable(frameInfo.request, metadata);
tryComplete(&frameInfo);
}
@@ -433,7 +433,7 @@ void RkISP1CameraData::metadataReady(unsigned int frame, const ControlList &meta
if (!info)
return;
- info->request->metadata().merge(metadata);
+ pipe()->metadataAvailable(info->request, metadata);
info->metadataProcessed = true;
pipe()->tryCompleteRequest(info);
@@ -1476,8 +1476,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)
* \todo The sensor timestamp should be better estimated by connecting
* to the V4L2Device::frameStart signal.
*/
- request->metadata().set(controls::SensorTimestamp,
- metadata.timestamp);
+ metadataAvailable(request, controls::SensorTimestamp, metadata.timestamp);
if (isRaw_) {
const ControlList &ctrls =
@@ -1560,7 +1559,7 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)
LOG(RkISP1, Error) << "Cannot queue buffers to dewarper: "
<< strerror(-ret);
- request->metadata().set(controls::ScalerCrop, activeCrop_.value());
+ metadataAvailable(request, controls::ScalerCrop, activeCrop_.value());
}
void PipelineHandlerRkISP1::dewarpBufferReady(FrameBuffer *buffer)
@@ -909,7 +909,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)
}
if (request)
- request->metadata().set(controls::SensorTimestamp,
+ // TODO: is this correct? should it be set later?
+ pipe->metadataAvailable(request, controls::SensorTimestamp,
buffer->metadata().timestamp);
/*
@@ -997,7 +998,7 @@ void SimpleCameraData::metadataReady(uint32_t frame, const ControlList &metadata
if (!info)
return;
- info->request->metadata().merge(metadata);
+ pipe()->metadataAvailable(info->request, metadata);
info->metadataProcessed = true;
tryCompleteRequest(info->request);
}
@@ -883,8 +883,7 @@ void UVCCameraData::imageBufferReady(FrameBuffer *buffer)
Request *request = buffer->request();
/* \todo Use the UVC metadata to calculate a more precise timestamp */
- request->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe()->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
pipe()->completeBuffer(request, buffer);
pipe()->completeRequest(request);
@@ -617,8 +617,7 @@ void VimcCameraData::imageBufferReady(FrameBuffer *buffer)
}
/* Record the sensor's timestamp in the request metadata. */
- request->metadata().set(controls::SensorTimestamp,
- buffer->metadata().timestamp);
+ pipe->metadataAvailable(request, controls::SensorTimestamp, buffer->metadata().timestamp);
pipe->completeBuffer(request, buffer);
pipe->completeRequest(request);
@@ -331,7 +331,7 @@ int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,
ASSERT(found);
}
- request->metadata().set(controls::SensorTimestamp, timestamp);
+ metadataAvailable(request, controls::SensorTimestamp, timestamp);
completeRequest(request);
return 0;