f484857994
Since commit 96aecfe365 ("libcamera: camera_sensor: Use active area
size as resolution") the CameraSensor::resolution() method returned the
sensor's active pixel area size.
As the CameraSensor::resolution() method is widely used in the library
code base to retrieve the maximum frame size the sensor can produce,
in case it is smaller than the pixel area size the returned size cannot
be used to configure the sensor correctly.
Fix this by returning the maximum frame resolution the sensor can
produce, or the pixel area size in case the sensor embeds and ISP that
can upscale and the supported maximum frame size is thus larger that
the pixel array size.
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
103 lines
2.3 KiB
C++
103 lines
2.3 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* camera_sensor.h - A camera sensor
|
|
*/
|
|
#ifndef __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__
|
|
#define __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <libcamera/class.h>
|
|
#include <libcamera/controls.h>
|
|
#include <libcamera/geometry.h>
|
|
|
|
#include "libcamera/internal/formats.h"
|
|
#include "libcamera/internal/log.h"
|
|
#include "libcamera/internal/v4l2_subdevice.h"
|
|
|
|
namespace libcamera {
|
|
|
|
class BayerFormat;
|
|
class MediaEntity;
|
|
|
|
struct CameraSensorInfo {
|
|
std::string model;
|
|
|
|
uint32_t bitsPerPixel;
|
|
|
|
Size activeAreaSize;
|
|
Rectangle analogCrop;
|
|
Size outputSize;
|
|
|
|
uint64_t pixelRate;
|
|
uint32_t lineLength;
|
|
|
|
uint32_t minFrameLength;
|
|
uint32_t maxFrameLength;
|
|
};
|
|
|
|
class CameraSensor : protected Loggable
|
|
{
|
|
public:
|
|
explicit CameraSensor(const MediaEntity *entity);
|
|
~CameraSensor();
|
|
|
|
int init();
|
|
|
|
const std::string &model() const { return model_; }
|
|
const std::string &id() const { return id_; }
|
|
const MediaEntity *entity() const { return entity_; }
|
|
const std::vector<unsigned int> &mbusCodes() const { return mbusCodes_; }
|
|
const std::vector<Size> &sizes() const { return sizes_; }
|
|
Size resolution() const;
|
|
|
|
V4L2SubdeviceFormat getFormat(const std::vector<unsigned int> &mbusCodes,
|
|
const Size &size) const;
|
|
int setFormat(V4L2SubdeviceFormat *format);
|
|
|
|
const ControlInfoMap &controls() const;
|
|
ControlList getControls(const std::vector<uint32_t> &ids);
|
|
int setControls(ControlList *ctrls);
|
|
|
|
V4L2Subdevice *device() { return subdev_.get(); }
|
|
|
|
const ControlList &properties() const { return properties_; }
|
|
int sensorInfo(CameraSensorInfo *info) const;
|
|
|
|
protected:
|
|
std::string logPrefix() const override;
|
|
|
|
private:
|
|
LIBCAMERA_DISABLE_COPY(CameraSensor)
|
|
|
|
int generateId();
|
|
int validateSensorDriver();
|
|
void initVimcDefaultProperties();
|
|
int initProperties();
|
|
|
|
const MediaEntity *entity_;
|
|
std::unique_ptr<V4L2Subdevice> subdev_;
|
|
unsigned int pad_;
|
|
|
|
std::string model_;
|
|
std::string id_;
|
|
|
|
V4L2Subdevice::Formats formats_;
|
|
std::vector<unsigned int> mbusCodes_;
|
|
std::vector<Size> sizes_;
|
|
|
|
Size pixelArraySize_;
|
|
Rectangle activeArea_;
|
|
const BayerFormat *bayerFormat_;
|
|
|
|
ControlList properties_;
|
|
};
|
|
|
|
} /* namespace libcamera */
|
|
|
|
#endif /* __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__ */
|