@@ -18,6 +18,7 @@ namespace libcamera {
class CameraManager;
class DeviceEnumerator;
class Stream;
+class StreamConfiguration;
class PipelineHandler
{
@@ -26,6 +27,8 @@ public:
virtual std::vector<Stream> streams(const Camera *camera) const = 0;
+ virtual int configure(const Camera *camera, std::vector<StreamConfiguration *> &config) = 0;
+
virtual bool match(CameraManager *manager, DeviceEnumerator *enumerator) = 0;
};
@@ -29,6 +29,8 @@ public:
std::vector<Stream> streams(const Camera *camera) const;
+ int configure(const Camera *camera, std::vector<StreamConfiguration *> &config);
+
bool match(CameraManager *manager, DeviceEnumerator *enumerator);
private:
@@ -74,6 +76,28 @@ std::vector<Stream> PipelineHandlerIPU3::streams(const Camera *camera) const
return streams;
}
+int PipelineHandlerIPU3::configure(const Camera *camera,
+ std::vector<StreamConfiguration *> &config)
+{
+ StreamConfiguration *cfg;
+
+ if (!handleCamera(camera))
+ return -EINVAL;
+
+ if (config.size() != 1)
+ return -EINVAL;
+
+ cfg = config.front();
+
+ if (!cfg || cfg->id() != 0)
+ return -EINVAL;
+
+ LOG(IPU3, Info) << "TODO: Configure the camera for resolution " <<
+ cfg->width() << "x" << cfg->height();
+
+ return 0;
+}
+
bool PipelineHandlerIPU3::match(CameraManager *manager, DeviceEnumerator *enumerator)
{
DeviceMatch cio2_dm("ipu3-cio2");
@@ -26,6 +26,8 @@ public:
std::vector<Stream> streams(const Camera *camera) const;
+ int configure(const Camera *camera, std::vector<StreamConfiguration *> &config);
+
bool match(CameraManager *manager, DeviceEnumerator *enumerator);
private:
@@ -59,6 +61,28 @@ std::vector<Stream> PipelineHandlerUVC::streams(const Camera *camera) const
return streams;
}
+int PipelineHandlerUVC::configure(const Camera *camera,
+ std::vector<StreamConfiguration *> &config)
+{
+ StreamConfiguration *cfg;
+
+ if (!camera || camera != camera_.get())
+ return -EINVAL;
+
+ if (config.size() != 1)
+ return -EINVAL;
+
+ cfg = config.front();
+
+ if (!cfg || cfg->id() != 0)
+ return -EINVAL;
+
+ LOG(UVC, Info) << "TODO: Configure the camera for resolution " <<
+ cfg->width() << "x" << cfg->height();
+
+ return 0;
+}
+
bool PipelineHandlerUVC::match(CameraManager *manager, DeviceEnumerator *enumerator)
{
DeviceMatch dm("uvcvideo");
@@ -26,6 +26,8 @@ public:
std::vector<Stream> streams(const Camera *camera) const;
+ int configure(const Camera *camera, std::vector<StreamConfiguration *> &config);
+
bool match(CameraManager *manager, DeviceEnumerator *enumerator);
private:
@@ -59,6 +61,28 @@ std::vector<Stream> PipeHandlerVimc::streams(const Camera *camera) const
return streams;
}
+int PipeHandlerVimc::configure(const Camera *camera,
+ std::vector<StreamConfiguration *> &config)
+{
+ StreamConfiguration *cfg;
+
+ if (!camera || camera != camera_.get())
+ return -EINVAL;
+
+ if (config.size() != 1)
+ return -EINVAL;
+
+ cfg = config.front();
+
+ if (!cfg || cfg->id() != 0)
+ return -EINVAL;
+
+ LOG(VIMC, Info) << "TODO: Configure the camera for resolution " <<
+ cfg->width() << "x" << cfg->height();
+
+ return 0;
+}
+
bool PipeHandlerVimc::match(CameraManager *manager, DeviceEnumerator *enumerator)
{
DeviceMatch dm("vimc");
@@ -46,6 +46,24 @@ LOG_DEFINE_CATEGORY(Pipeline)
* is not part of the PipelineHandler.
*/
+/**
+ * \fn PipelineHandler::configure(const Camera *camera, std::vector<StreamConfiguration *> &config)
+ * \brief Configure a set of streams for a camera
+ * \param[in] camera The camera to configure streams for
+ * \param[in] config A array of stream configurations to try and setup
+ *
+ * This function is the interface to configure one or more streams of a camera
+ * for capture. The intended user for this interface is the Camera class which
+ * will receive the array of configurations to apply from the application.
+ *
+ * The caller needs to verify the StreamConfiguration objects in the passed
+ * array after the call as it might remove one or more to satisfy hardware
+ * limitations. The call might also alter any or all of the configuration
+ * parameters of any stream to fit within valid operational conditions.
+ *
+ * \return 0 on success or a negative error code on error.
+ */
+
/**
* \fn PipelineHandler::match(DeviceEnumerator *enumerator)
* \brief Match media devices and create camera instances
All the streams which are to be used needs to be configured at the same time, that is passed from the application to the pipeline handler in a single call. This would allow the pipeline handler to take any dependences between the different streams and there configuration into account when setting up the hardware. This implementation do not interact with any hardware, instead it extends all pipeline handlers with the argument validation needed to make sure the configuration request is sound. It then proceeds to print the requested frame dimensions to the log. Future work based on more components are needed to make the pipeline specific implementations truly useful. Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se> --- src/libcamera/include/pipeline_handler.h | 3 +++ src/libcamera/pipeline/ipu3/ipu3.cpp | 24 ++++++++++++++++++++++++ src/libcamera/pipeline/uvcvideo.cpp | 24 ++++++++++++++++++++++++ src/libcamera/pipeline/vimc.cpp | 24 ++++++++++++++++++++++++ src/libcamera/pipeline_handler.cpp | 18 ++++++++++++++++++ 5 files changed, 93 insertions(+)