libcamera: pipeline: Cast to derived pipeline handler with helpers

Replace manual static casts from the PipelineHandler pointer to a
derived class pointer with helper functions in the camera data classes.
This simplifies code accessing the pipeline from the camera data.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2021-07-23 04:39:44 +03:00
parent 034b5d3699
commit cb63fc75fb
2 changed files with 17 additions and 13 deletions
+9 -7
View File
@@ -155,6 +155,7 @@ public:
MediaEntity *sensor);
bool isValid() const { return sensor_ != nullptr; }
SimplePipelineHandler *pipe();
int init();
int setupLinks();
@@ -352,11 +353,14 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,
[](const Entity &e) { return e.entity->name(); });
}
SimplePipelineHandler *SimpleCameraData::pipe()
{
return static_cast<SimplePipelineHandler *>(Camera::Private::pipe());
}
int SimpleCameraData::init()
{
SimplePipelineHandler *pipe =
static_cast<SimplePipelineHandler *>(this->pipe());
SimpleConverter *converter = pipe->converter();
SimpleConverter *converter = pipe()->converter();
int ret;
/*
@@ -480,8 +484,7 @@ int SimpleCameraData::setupLinks()
int SimpleCameraData::setupFormats(V4L2SubdeviceFormat *format,
V4L2Subdevice::Whence whence)
{
SimplePipelineHandler *pipe =
static_cast<SimplePipelineHandler *>(this->pipe());
SimplePipelineHandler *pipe = SimpleCameraData::pipe();
int ret;
/*
@@ -582,8 +585,7 @@ CameraConfiguration::Status SimpleCameraConfiguration::validate()
}
/* Adjust the requested streams. */
SimplePipelineHandler *pipe = static_cast<SimplePipelineHandler *>(data_->pipe());
SimpleConverter *converter = pipe->converter();
SimpleConverter *converter = data_->pipe()->converter();
/*
* Enable usage of the converter when producing multiple streams, as