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

libcamera: converter_v4l2_m2m: Add helper to apply controls

Browse Source 
Add applyControls() helper to apply controls for a stream.

Signed-off-by: Umang Jain <umang.jain@ideasonboard.com>
Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com>
Reviewed-by: Isaac Scott <isaac.scott@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Umang Jain
2025-11-25 17:28:21 +01:00
committed by Stefan Klug
parent ae4cd6e427
commit 801c3c3010
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/libcamera/internal/converter/converter_v4l2_m2m.h
View File

@@ -24,6 +24,7 @@
namespace libcamera {
class ControlList;
class FrameBuffer;
class MediaDevice;
class Size;
@@ -73,6 +74,8 @@ public:
std::pair<Rectangle, Rectangle> inputCropBounds() override { return inputCropBounds_; }
std::pair<Rectangle, Rectangle> inputCropBounds(const Stream *stream) override;
int applyControls(const Stream *stream, ControlList &ctrls, const V4L2Request *request = nullptr);
int allocateRequests(unsigned int count,
std::vector<std::unique_ptr<V4L2Request>> *requests);
@@ -94,6 +97,8 @@ private:
int start();
void stop();
int applyControls(ControlList &ctrls, const V4L2Request *request = nullptr);
int queueBuffers(FrameBuffer *input, FrameBuffer *output,
const V4L2Request *request = nullptr);

34
src/libcamera/converter/converter_v4l2_m2m.cpp
View File

@@ -18,6 +18,7 @@
#include <libcamera/base/signal.h>
#include <libcamera/base/utils.h>
#include <libcamera/controls.h>
#include <libcamera/framebuffer.h>
#include <libcamera/geometry.h>
#include <libcamera/stream.h>
@@ -251,6 +252,20 @@ void V4L2M2MConverter::V4L2M2MStream::captureBufferReady(FrameBuffer *buffer)
converter_->outputBufferReady.emit(buffer);
}
/**
* \brief Apply controls
* \param[in] ctrls The controls to apply
* \param[in] request An optional request
*
* \return 0 on success or a negative error code otherwise
* \see V4L2Device::setControls()
*/
int V4L2M2MConverter::V4L2M2MStream::applyControls(ControlList &ctrls,
const V4L2Request *request)
{
return m2m_->capture()->setControls(&ctrls, request);
}
/* -----------------------------------------------------------------------------
* V4L2M2MConverter
*/
@@ -744,6 +759,25 @@ int V4L2M2MConverter::queueBuffers(FrameBuffer *input,
return 0;
}
/**
* \brief Apply controls
* \param[in] stream The stream on which to apply the controls
* \param[in] ctrls The controls to apply
* \param[in] request An optional request
*
* \return 0 on success or a negative error code otherwise
* \see V4L2Device::setControls()
*/
int V4L2M2MConverter::applyControls(const Stream *stream, ControlList &ctrls,
const V4L2Request *request)
{
auto iter = streams_.find(stream);
if (iter == streams_.end())
return -EINVAL;
return iter->second->applyControls(ctrls, request);
}
/**
* \copydoc libcamera::MediaDevice::allocateRequests
*/