@@ -330,6 +330,7 @@ public:
};
std::vector<Stream> streams_;
+ Stream *rawStream_;
/*
* All entities in the pipeline, from the camera sensor to the video
@@ -368,6 +369,11 @@ private:
void ispStatsReady(uint32_t frame, uint32_t bufferId);
void metadataReady(uint32_t frame, const ControlList &metadata);
void setSensorControls(const ControlList &sensorControls);
+
+ bool processedRequested() const
+ {
+ return streams_.size() - (rawStream_ ? 1 : 0) > 0;
+ }
};
class SimpleCameraConfiguration : public CameraConfiguration
@@ -457,7 +463,7 @@ private:
SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,
unsigned int numStreams,
MediaEntity *sensor)
- : Camera::Private(pipe), streams_(numStreams)
+ : Camera::Private(pipe), streams_(numStreams), rawStream_(nullptr)
{
/*
* Find the shortest path from the camera sensor to a video capture
@@ -868,10 +874,13 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)
* point converting an erroneous buffer.
*/
if (buffer->metadata().status != FrameMetadata::FrameSuccess) {
- if (!useConversion_) {
+ if (rawStream_) {
/* No conversion, just complete the request. */
Request *request = buffer->request();
pipe->completeBuffer(request, buffer);
+ SimpleFrameInfo *info = frameInfo_.find(request->sequence());
+ if (info)
+ info->metadataRequired = false;
tryCompleteRequest(request);
return;
}
@@ -881,7 +890,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)
* buffer for capture (unless the stream is being stopped), and
* complete the request with all the user-facing buffers.
*/
- if (buffer->metadata().status != FrameMetadata::FrameCancelled)
+ if (buffer->metadata().status != FrameMetadata::FrameCancelled &&
+ !rawStream_)
video_->queueBuffer(buffer);
if (conversionQueue_.empty())
@@ -930,13 +940,14 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)
*/
if (useConversion_) {
if (conversionQueue_.empty()) {
- video_->queueBuffer(buffer);
+ if (!rawStream_)
+ video_->queueBuffer(buffer);
return;
}
if (converter_)
converter_->queueBuffers(buffer, conversionQueue_.front().outputs);
- else
+ else if (processedRequested())
/*
* request->sequence() cannot be retrieved from `buffer' inside
* queueBuffers because unique_ptr's make buffer->request() invalid
@@ -946,6 +957,8 @@ void SimpleCameraData::imageBufferReady(FrameBuffer *buffer)
conversionQueue_.front().outputs);
conversionQueue_.pop();
+ if (rawStream_)
+ pipe->completeBuffer(request, buffer);
return;
}
@@ -983,7 +996,8 @@ void SimpleCameraData::tryCompleteRequest(Request *request)
void SimpleCameraData::conversionInputDone(FrameBuffer *buffer)
{
/* Queue the input buffer back for capture. */
- video_->queueBuffer(buffer);
+ if (!rawStream_)
+ video_->queueBuffer(buffer);
}
void SimpleCameraData::conversionOutputDone(FrameBuffer *buffer)
@@ -1500,11 +1514,20 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)
for (unsigned int i = 0; i < config->size(); ++i) {
StreamConfiguration &cfg = config->at(i);
+ bool rawStream = isFormatRaw(cfg.pixelFormat);
cfg.setStream(&data->streams_[i]);
- if (data->useConversion_ && !isFormatRaw(cfg.pixelFormat))
+ if (data->useConversion_ && !rawStream)
outputCfgs.push_back(cfg);
+
+ if (rawStream) {
+ if (data->rawStream_) {
+ LOG(SimplePipeline, Error) << "Multiple raw streams not supported";
+ return -EINVAL;
+ }
+ data->rawStream_ = &data->streams_[i];
+ }
}
if (outputCfgs.empty())
@@ -1535,7 +1558,7 @@ int SimplePipelineHandler::exportFrameBuffers(Camera *camera, Stream *stream,
* Export buffers on the converter or capture video node, depending on
* whether the converter is used or not.
*/
- if (data->useConversion_)
+ if (data->useConversion_ && stream != data->rawStream_)
return data->converter_
? data->converter_->exportBuffers(stream, count, buffers)
: data->swIsp_->exportBuffers(stream, count, buffers);
@@ -1558,7 +1581,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL
return -EBUSY;
}
- if (data->useConversion_) {
+ if (data->useConversion_ && !data->rawStream_) {
/*
* When using the converter allocate a fixed number of internal
* buffers.
@@ -1566,8 +1589,11 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL
ret = video->allocateBuffers(kNumInternalBuffers,
&data->conversionBuffers_);
} else {
- /* Otherwise, prepare for using buffers from the only stream. */
- Stream *stream = &data->streams_[0];
+ /*
+ * Otherwise, prepare for using buffers from either the raw stream, if
+ * requested, or the only stream configured.
+ */
+ Stream *stream = (data->rawStream_ ? data->rawStream_ : &data->streams_[0]);
ret = video->importBuffers(stream->configuration().bufferCount);
}
if (ret < 0) {
@@ -1608,8 +1634,9 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] const ControlL
}
/* Queue all internal buffers for capture. */
- for (std::unique_ptr<FrameBuffer> &buffer : data->conversionBuffers_)
- video->queueBuffer(buffer.get());
+ if (!data->rawStream_)
+ for (std::unique_ptr<FrameBuffer> &buffer : data->conversionBuffers_)
+ video->queueBuffer(buffer.get());
}
return 0;
@@ -1660,7 +1687,7 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)
* queue, it will be handed to the converter in the capture
* completion handler.
*/
- if (data->useConversion_) {
+ if (data->useConversion_ && stream != data->rawStream_) {
buffers.emplace(stream, buffer);
metadataRequired = !!data->swIsp_;
} else {
When a raw stream is requested, whether alone or together with a processed stream, its buffers must be handled outside the software ISP machinery. They serve as output buffers, even when a processed stream is produced. At most one raw stream and at most one processed stream are supported and can be combined. An example of producing both raw and processed files using `cam' application: cam -c1 -C100 -Ffile# \ -s role=viewfinder,width=1920,height=1080,pixelformat=RGB888 \ -s role=raw,width=3280,height=2464,pixelformat=SRGGB8 \ Note the difference in viewfinder and raw stream sizes due to the fact that debayering requires enlarging the image width, which enforces selecting a larger sensor resolution in this case. In order to track whether a raw stream is requested and which one it is, SimpleCameraData::rawStream_ member variable is introduced. This is the final step to make raw streams working. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- src/libcamera/pipeline/simple/simple.cpp | 55 ++++++++++++++++++------ 1 file changed, 41 insertions(+), 14 deletions(-)