@@ -72,10 +72,10 @@ public:
int start();
void stop();
- int queueBuffers(FrameBuffer *input,
+ int queueBuffers(uint32_t frame, FrameBuffer *input,
const std::map<unsigned int, FrameBuffer *> &outputs);
- void process(FrameBuffer *input, FrameBuffer *output);
+ void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output);
Signal<FrameBuffer *> inputBufferReady;
Signal<FrameBuffer *> outputBufferReady;
@@ -864,7 +864,13 @@ void SimpleCameraData::bufferReady(FrameBuffer *buffer)
if (converter_)
converter_->queueBuffers(buffer, conversionQueue_.front());
else
- swIsp_->queueBuffers(buffer, conversionQueue_.front());
+ /*
+ * request->sequence() cannot be retrieved from `buffer' inside
+ * queueBuffers because unique_ptr's make buffer->request() invalid
+ * already here.
+ */
+ swIsp_->queueBuffers(request->sequence(), buffer,
+ conversionQueue_.front());
conversionQueue_.pop();
return;
@@ -94,8 +94,9 @@ Debayer::~Debayer()
*/
/**
- * \fn void Debayer::process(FrameBuffer *input, FrameBuffer *output, DebayerParams params)
+ * \fn void Debayer::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params)
* \brief Process the bayer data into the requested format
+ * \param[in] frame The frame number
* \param[in] input The input buffer
* \param[in] output The output buffer
* \param[in] params The parameters to be used in debayering
@@ -40,7 +40,7 @@ public:
virtual std::tuple<unsigned int, unsigned int>
strideAndFrameSize(const PixelFormat &outputFormat, const Size &size) = 0;
- virtual void process(FrameBuffer *input, FrameBuffer *output, DebayerParams params) = 0;
+ virtual void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params) = 0;
virtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0;
@@ -731,7 +731,7 @@ static inline int64_t timeDiff(timespec &after, timespec &before)
(int64_t)after.tv_nsec - (int64_t)before.tv_nsec;
}
-void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams params)
+void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params)
{
timespec frameStartTime;
@@ -785,12 +785,11 @@ void DebayerCpu::process(FrameBuffer *input, FrameBuffer *output, DebayerParams
}
/*
- * Frame and buffer ids are currently not used, so pass zeros as parameters.
+ * Buffer ids are currently not used, so pass zeros as its parameter.
*
- * \todo Pass real values once frame is passed here and stats buffer passing
- * is changed.
+ * \todo Pass real bufferId once stats buffer passing is changed.
*/
- stats_->finishFrame(0, 0);
+ stats_->finishFrame(frame, 0);
outputBufferReady.emit(output);
inputBufferReady.emit(input);
}
@@ -36,7 +36,7 @@ public:
std::vector<PixelFormat> formats(PixelFormat input);
std::tuple<unsigned int, unsigned int>
strideAndFrameSize(const PixelFormat &outputFormat, const Size &size);
- void process(FrameBuffer *input, FrameBuffer *output, DebayerParams params);
+ void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params);
SizeRange sizes(PixelFormat inputFormat, const Size &inputSize);
/**
@@ -14,6 +14,7 @@
#include <unistd.h>
#include <libcamera/formats.h>
+#include <libcamera/request.h>
#include <libcamera/stream.h>
#include "libcamera/internal/ipa_manager.h"
@@ -279,12 +280,13 @@ int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,
/**
* \brief Queue buffers to Software ISP
+ * \param[in] frame The frame number
* \param[in] input The input framebuffer
* \param[in] outputs The container holding the output stream indexes and
* their respective frame buffer outputs
* \return 0 on success, a negative errno on failure
*/
-int SoftwareIsp::queueBuffers(FrameBuffer *input,
+int SoftwareIsp::queueBuffers(uint32_t frame, FrameBuffer *input,
const std::map<unsigned int, FrameBuffer *> &outputs)
{
unsigned int mask = 0;
@@ -308,7 +310,7 @@ int SoftwareIsp::queueBuffers(FrameBuffer *input,
mask |= 1 << index;
}
- process(input, outputs.at(0));
+ process(frame, input, outputs.at(0));
return 0;
}
@@ -340,13 +342,14 @@ void SoftwareIsp::stop()
/**
* \brief Passes the input framebuffer to the ISP worker to process
+ * \param[in] frame The frame number
* \param[in] input The input framebuffer
* \param[out] output The framebuffer to write the processed frame to
*/
-void SoftwareIsp::process(FrameBuffer *input, FrameBuffer *output)
+void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output)
{
debayer_->invokeMethod(&DebayerCpu::process,
- ConnectionTypeQueued, input, output, debayerParams_);
+ ConnectionTypeQueued, frame, input, output, debayerParams_);
}
void SoftwareIsp::saveIspParams()
A previous preparation patch implemented passing frame ids to stats processing but without actual meaningful frame id value passed there. This patch extends that by actually providing the frame id and passing it through to the stats processor. The frame id is taken from the request sequence number, the same as in hardware pipelines. Dear reviewers: I'm confused even after looking at commit 6084217cd3b52ba5677e3ca2de0e21008fdaa735. What's the relationship between requests, buffers and frames? It's not 1:1:1 or is it? Could you please provide some explanation that could be put here? Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- .../libcamera/internal/software_isp/software_isp.h | 4 ++-- src/libcamera/pipeline/simple/simple.cpp | 8 +++++++- src/libcamera/software_isp/debayer.cpp | 3 ++- src/libcamera/software_isp/debayer.h | 2 +- src/libcamera/software_isp/debayer_cpu.cpp | 9 ++++----- src/libcamera/software_isp/debayer_cpu.h | 2 +- src/libcamera/software_isp/software_isp.cpp | 11 +++++++---- 7 files changed, 24 insertions(+), 15 deletions(-)