NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: camera_sensor: Prepare for multi-subdev camera sensors

Browse source 
While most camera sensors are exposed to userspace as a single subdev,
this is not always the case. A notable exception is the smiapp driver,
which exposes two or three subdevs. The subdev at the output of the
camera sensor will thus have more than one pad. Prepare for this by
removing the single-pad restriction, and locating the source pad
dynamically.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2020-05-02 16:12:35 +03:00
parent 3697c93a8d
commit 3d42c67aab
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/libcamera/camera_sensor.cpp
View file

@ -131,7 +131,7 @@ LOG_DEFINE_CATEGORY(CameraSensor);
* Once constructed the instance must be initialized with init(). * Once constructed the instance must be initialized with init().
*/ */
CameraSensor::CameraSensor(const MediaEntity *entity) CameraSensor::CameraSensor(const MediaEntity *entity)
: entity_(entity), properties_(properties::properties) : entity_(entity), pad_(UINT_MAX), properties_(properties::properties)
{ {
} }
@ -152,9 +152,14 @@ CameraSensor::~CameraSensor()
*/ */
int CameraSensor::init() int CameraSensor::init()
{ {
int ret; for (const MediaPad *pad : entity_->pads()) {
if (pad->flags() & MEDIA_PAD_FL_SOURCE) {
pad_ = pad->index();
break;
}
}
if (entity_->pads().size() != 1) { if (pad_ == UINT_MAX) {
LOG(CameraSensor, Error) LOG(CameraSensor, Error)
<< "Sensors with more than one pad are not supported"; << "Sensors with more than one pad are not supported";
return -EINVAL; return -EINVAL;
@ -197,7 +202,7 @@ int CameraSensor::init()
/* Create and open the subdev. */ /* Create and open the subdev. */
subdev_ = std::make_unique<V4L2Subdevice>(entity_); subdev_ = std::make_unique<V4L2Subdevice>(entity_);
ret = subdev_->open(); int ret = subdev_->open();
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -241,7 +246,7 @@ int CameraSensor::init()
properties_.set(properties::Rotation, propertyValue); properties_.set(properties::Rotation, propertyValue);
/* Enumerate and cache media bus codes and sizes. */ /* Enumerate and cache media bus codes and sizes. */
const ImageFormats formats = subdev_->formats(0); const ImageFormats formats = subdev_->formats(pad_);
if (formats.isEmpty()) { if (formats.isEmpty()) {
LOG(CameraSensor, Error) << "No image format found"; LOG(CameraSensor, Error) << "No image format found";
return -EINVAL; return -EINVAL;
@ -405,7 +410,7 @@ V4L2SubdeviceFormat CameraSensor::getFormat(const std::vector<unsigned int> &mbu
*/ */
int CameraSensor::setFormat(V4L2SubdeviceFormat *format) int CameraSensor::setFormat(V4L2SubdeviceFormat *format)
{ {
return subdev_->setFormat(0, format); return subdev_->setFormat(pad_, format);
} }
/** /**
@ -489,7 +494,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const
/* Get the active area size. */ /* Get the active area size. */
Rectangle rect = {}; Rectangle rect = {};
int ret = subdev_->getSelection(0, V4L2_SEL_TGT_CROP_DEFAULT, &rect); int ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP_DEFAULT, &rect);
if (ret) { if (ret) {
LOG(CameraSensor, Error) LOG(CameraSensor, Error)
<< "Failed to construct camera sensor info: " << "Failed to construct camera sensor info: "
@ -500,7 +505,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const
info->activeAreaSize = { rect.width, rect.height }; info->activeAreaSize = { rect.width, rect.height };
/* It's mandatory for the subdevice to report its crop rectangle. */ /* It's mandatory for the subdevice to report its crop rectangle. */
ret = subdev_->getSelection(0, V4L2_SEL_TGT_CROP, &info->analogCrop); ret = subdev_->getSelection(pad_, V4L2_SEL_TGT_CROP, &info->analogCrop);
if (ret) { if (ret) {
LOG(CameraSensor, Error) LOG(CameraSensor, Error)
<< "Failed to construct camera sensor info: " << "Failed to construct camera sensor info: "
@ -510,7 +515,7 @@ int CameraSensor::sensorInfo(CameraSensorInfo *info) const
/* The bit depth and image size depend on the currently applied format. */ /* The bit depth and image size depend on the currently applied format. */
V4L2SubdeviceFormat format{}; V4L2SubdeviceFormat format{};
ret = subdev_->getFormat(0, &format); ret = subdev_->getFormat(pad_, &format);
if (ret) if (ret)
return ret; return ret;
info->bitsPerPixel = format.bitsPerPixel(); info->bitsPerPixel = format.bitsPerPixel();

2
src/libcamera/include/camera_sensor.h
View file

@ -70,6 +70,8 @@ protected:
private: private:
const MediaEntity *entity_; const MediaEntity *entity_;
std::unique_ptr<V4L2Subdevice> subdev_; std::unique_ptr<V4L2Subdevice> subdev_;
unsigned int pad_;
std::string model_; std::string model_;
std::vector<unsigned int> mbusCodes_; std::vector<unsigned int> mbusCodes_;