Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-26 10:05:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

libcamera: pipeline: rkisp1: Move path link handling to RkISP1Path

Browse source 
Move the path link handling to RkISP1Path, there is no functional
change.

Signed-off-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Niklas Söderlund 2020-09-25 00:40:23 +02:00
parent 038e2fd66c
commit 66c1aae8f4
3 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View file

@ -1015,20 +1015,13 @@ int PipelineHandlerRkISP1::initLinks(const Camera *camera,
}
for (const StreamConfiguration &cfg : config) {
MediaLink *link;
if (cfg.stream() == &data->mainPathStream_)
link = media_->link("rkisp1_isp", 2,
"rkisp1_resizer_mainpath", 0);
ret = data->mainPath_->setEnabled(true);
else if (cfg.stream() == &data->selfPathStream_)
link = media_->link("rkisp1_isp", 2,
"rkisp1_resizer_selfpath", 0);
ret = data->selfPath_->setEnabled(true);
else
return -EINVAL;
if (!link)
return -ENODEV;
ret = link->setEnabled(true);
if (ret < 0)
return ret;
}

6
src/libcamera/pipeline/rkisp1/rkisp1_path.cpp
View file

@ -22,7 +22,7 @@ RkISP1Path::RkISP1Path(const char *name, const Span<const PixelFormat> &formats,
const Size &minResolution, const Size &maxResolution)
: name_(name), running_(false), formats_(formats),
minResolution_(minResolution), maxResolution_(maxResolution),
resizer_(nullptr), video_(nullptr)
resizer_(nullptr), video_(nullptr), link_(nullptr)
{
}
@ -45,6 +45,10 @@ bool RkISP1Path::init(MediaDevice *media)
if (video_->open() < 0)
return false;
link_ = media->link("rkisp1_isp", 2, resizer, 0);
if (!link_)
return false;
return true;
}

4
src/libcamera/pipeline/rkisp1/rkisp1_path.h
View file

@ -15,6 +15,7 @@
#include <libcamera/signal.h>
#include <libcamera/span.h>
#include "libcamera/internal/media_object.h"
#include "libcamera/internal/v4l2_videodevice.h"
namespace libcamera {
@ -33,6 +34,8 @@ public:
bool init(MediaDevice *media);
int setEnabled(bool enable) { return link_->setEnabled(enable); }
StreamConfiguration generateConfiguration(const Size &resolution);
CameraConfiguration::Status validate(StreamConfiguration *cfg);
@ -63,6 +66,7 @@ private:
V4L2Subdevice *resizer_;
V4L2VideoDevice *video_;
MediaLink *link_;
};
class RkISP1MainPath : public RkISP1Path