85befa816e
Commit6f6e1bf704("libcamera: camera_sensor: Apply flips at setFormat()") extended the CameraSensor::setFormat() function to apply vertical/horizontal flips on the sensor based on the supplied Transform. To pass the Transform to the function the V4L2SubdeviceFormat structure has been augmented with a Transform member. However as the newly added Transform is not used at all in the V4L2Subdevice class, it should not be part of V4L2SubdeviceFormat. Fix that by removing the transform field from V4L2SubdeviceFormat and pass it as an explicit parameter to CameraSensor::setFormat(). Fixes:6f6e1bf704("libcamera: camera_sensor: Apply flips at setFormat()) Signed-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
116 lines
2.8 KiB
C++
116 lines
2.8 KiB
C++
/* SPDX-License-Identifier: LGPL-2.1-or-later */
|
|
/*
|
|
* Copyright (C) 2019, Google Inc.
|
|
*
|
|
* camera_sensor.h - A camera sensor
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
#include <vector>
|
|
|
|
#include <libcamera/base/class.h>
|
|
#include <libcamera/base/log.h>
|
|
|
|
#include <libcamera/control_ids.h>
|
|
#include <libcamera/controls.h>
|
|
#include <libcamera/geometry.h>
|
|
#include <libcamera/transform.h>
|
|
|
|
#include <libcamera/ipa/core_ipa_interface.h>
|
|
|
|
#include "libcamera/internal/formats.h"
|
|
#include "libcamera/internal/v4l2_subdevice.h"
|
|
|
|
namespace libcamera {
|
|
|
|
class BayerFormat;
|
|
class CameraLens;
|
|
class MediaEntity;
|
|
|
|
struct CameraSensorProperties;
|
|
|
|
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_; }
|
|
std::vector<Size> sizes(unsigned int mbusCode) const;
|
|
Size resolution() const;
|
|
const std::vector<controls::draft::TestPatternModeEnum> &testPatternModes() const
|
|
{
|
|
return testPatternModes_;
|
|
}
|
|
int setTestPatternMode(controls::draft::TestPatternModeEnum mode);
|
|
|
|
V4L2SubdeviceFormat getFormat(const std::vector<unsigned int> &mbusCodes,
|
|
const Size &size) const;
|
|
int setFormat(V4L2SubdeviceFormat *format,
|
|
Transform transform = Transform::Identity);
|
|
|
|
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(IPACameraSensorInfo *info) const;
|
|
|
|
void updateControlInfo();
|
|
|
|
CameraLens *focusLens() { return focusLens_.get(); }
|
|
|
|
Transform validateTransform(Transform *transform) const;
|
|
|
|
protected:
|
|
std::string logPrefix() const override;
|
|
|
|
private:
|
|
LIBCAMERA_DISABLE_COPY(CameraSensor)
|
|
|
|
int generateId();
|
|
int validateSensorDriver();
|
|
void initVimcDefaultProperties();
|
|
void initStaticProperties();
|
|
void initTestPatternModes();
|
|
int initProperties();
|
|
int applyTestPatternMode(controls::draft::TestPatternModeEnum mode);
|
|
int discoverAncillaryDevices();
|
|
|
|
const MediaEntity *entity_;
|
|
std::unique_ptr<V4L2Subdevice> subdev_;
|
|
unsigned int pad_;
|
|
|
|
const CameraSensorProperties *staticProps_;
|
|
|
|
std::string model_;
|
|
std::string id_;
|
|
|
|
V4L2Subdevice::Formats formats_;
|
|
std::vector<unsigned int> mbusCodes_;
|
|
std::vector<Size> sizes_;
|
|
std::vector<controls::draft::TestPatternModeEnum> testPatternModes_;
|
|
controls::draft::TestPatternModeEnum testPatternMode_;
|
|
|
|
Size pixelArraySize_;
|
|
Rectangle activeArea_;
|
|
const BayerFormat *bayerFormat_;
|
|
bool supportFlips_;
|
|
|
|
ControlList properties_;
|
|
|
|
std::unique_ptr<CameraLens> focusLens_;
|
|
};
|
|
|
|
} /* namespace libcamera */
|