PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: converter: Replace usage of stream index by Stream pointer

Browse Source 
The converter interface uses the unsigned int output stream index to map
to the output frame buffers. This is cumbersome to implement new
converters because one has to keep around additional book keeping
to track the streams with their correct indexes.

The v4l2_converter_m2m and simple pipeline handler are adapted to
use the new interface. This work roped in software ISP as well,
which also seems to use indexes (although it doesn't implement converter
interface) because of a common conversionQueue_ queue used for
converter_ and swIsp_.

The logPrefix is no longer able to generate an index from a stream, and
is updated to be more expressive by reporting the stream configuration
instead, for example, reporting "1920x1080-MJPEG" in place of
"stream0".

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Tested-by: Andrei Konovalov <andrey.konovalov.ynk@gmail.com> # sm8250 RB5
This commit is contained in:
Umang Jain
2024-06-24 19:18:59 +05:30
parent 7f85673e13
commit cc3a3c46a5
7 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/libcamera/software_isp/software_isp.cpp
View File

@@ -241,19 +241,19 @@ int SoftwareIsp::configure(const StreamConfiguration &inputCfg,
/**
* \brief Export the buffers from the Software ISP
* \param[in] output Output stream index exporting the buffers
* \param[in] stream Output stream exporting the buffers
* \param[in] count Number of buffers to allocate
* \param[out] buffers Vector to store the allocated buffers
* \return The number of allocated buffers on success or a negative error code
* otherwise
*/
int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,
int SoftwareIsp::exportBuffers(const Stream *stream, unsigned int count,
std::vector<std::unique_ptr<FrameBuffer>> *buffers)
{
ASSERT(debayer_ != nullptr);
/* single output for now */
if (output >= 1)
if (stream == nullptr)
return -EINVAL;
for (unsigned int i = 0; i < count; i++) {
@@ -280,12 +280,12 @@ int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,
/**
* \brief Queue buffers to Software ISP
* \param[in] input The input framebuffer
* \param[in] outputs The container holding the output stream indexes and
* \param[in] outputs The container holding the output stream pointers and
* their respective frame buffer outputs
* \return 0 on success, a negative errno on failure
*/
int SoftwareIsp::queueBuffers(FrameBuffer *input,
const std::map<unsigned int, FrameBuffer *> &outputs)
const std::map<const Stream *, FrameBuffer *> &outputs)
{
/*
* Validate the outputs as a sanity check: at least one output is
@@ -294,14 +294,15 @@ int SoftwareIsp::queueBuffers(FrameBuffer *input,
if (outputs.empty())
return -EINVAL;
for (auto [index, buffer] : outputs) {
for (auto [stream, buffer] : outputs) {
if (!buffer)
return -EINVAL;
if (index >= 1) /* only single stream atm */
if (outputs.size() != 1) /* only single stream atm */
return -EINVAL;
}
process(input, outputs.at(0));
for (auto iter = outputs.begin(); iter != outputs.end(); iter++)
process(input, iter->second);
return 0;
}