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

libipa: camera_sensor_helper: Reorganize gain constants

Browse source 
To prepare for other gain models than the linear model, store the gain
constants in a union with per-model members. Due to the lack of
designated initializer support in gcc with C++17, initializing a single
complex structure that includes a union will be difficult. Split the
gain model type to a separate variable to work around this issue.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Umang Jain <umang.jain@ideasonboard.com>
Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
This commit is contained in:
Laurent Pinchart 2022-02-24 21:55:44 +02:00
parent f9e2df9519
commit a9d43c4710
2 changed files with 65 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

102
src/ipa/libipa/camera_sensor_helper.cpp
View file

@ -58,11 +58,13 @@ namespace ipa {
*/ */
uint32_t CameraSensorHelper::gainCode(double gain) const uint32_t CameraSensorHelper::gainCode(double gain) const
{ {
ASSERT(analogueGainConstants_.m0 == 0 || analogueGainConstants_.m1 == 0); const AnalogueGainConstants &k = gainConstants_;
ASSERT(analogueGainConstants_.type == AnalogueGainLinear);
return (analogueGainConstants_.c0 - analogueGainConstants_.c1 * gain) / ASSERT(gainType_ == AnalogueGainLinear);
(analogueGainConstants_.m1 * gain - analogueGainConstants_.m0); ASSERT(k.linear.m0 == 0 || k.linear.m1 == 0);
return (k.linear.c0 - k.linear.c1 * gain) /
(k.linear.m1 * gain - k.linear.m0);
} }
/** /**
@ -80,11 +82,13 @@ uint32_t CameraSensorHelper::gainCode(double gain) const
*/ */
double CameraSensorHelper::gain(uint32_t gainCode) const double CameraSensorHelper::gain(uint32_t gainCode) const
{ {
ASSERT(analogueGainConstants_.m0 == 0 || analogueGainConstants_.m1 == 0); const AnalogueGainConstants &k = gainConstants_;
ASSERT(analogueGainConstants_.type == AnalogueGainLinear);
return (analogueGainConstants_.m0 * static_cast<double>(gainCode) + analogueGainConstants_.c0) / ASSERT(gainType_ == AnalogueGainLinear);
(analogueGainConstants_.m1 * static_cast<double>(gainCode) + analogueGainConstants_.c1); ASSERT(k.linear.m0 == 0 || k.linear.m1 == 0);
return (k.linear.m0 * static_cast<double>(gainCode) + k.linear.c0) /
(k.linear.m1 * static_cast<double>(gainCode) + k.linear.c1);
} }
/** /**
@ -127,42 +131,45 @@ double CameraSensorHelper::gain(uint32_t gainCode) const
* \todo not implemented in libipa * \todo not implemented in libipa
*/ */
/**
* \struct CameraSensorHelper::AnalogueGainLinearConstants
* \brief Analogue gain constants for the linear gain model
*
* \var CameraSensorHelper::AnalogueGainLinearConstants::m0
* \brief Constant used in the linear gain coding/decoding
*
* \note Either m0 or m1 shall be zero.
*
* \var CameraSensorHelper::AnalogueGainLinearConstants::c0
* \brief Constant used in the linear gain coding/decoding
*
* \var CameraSensorHelper::AnalogueGainLinearConstants::m1
* \brief Constant used in the linear gain coding/decoding
*
* \note Either m0 or m1 shall be zero.
*
* \var CameraSensorHelper::AnalogueGainLinearConstants::c1
* \brief Constant used in the linear gain coding/decoding
*/
/** /**
* \struct CameraSensorHelper::AnalogueGainConstants * \struct CameraSensorHelper::AnalogueGainConstants
* \brief Analogue gain constants used for gain calculation * \brief Analogue gain model constants
*/
/**
* \var CameraSensorHelper::AnalogueGainConstants::type
* \brief Analogue gain calculation mode
*/
/**
* \var CameraSensorHelper::AnalogueGainConstants::m0
* \brief Constant used in the analogue Gain coding/decoding
* *
* \note Either m0 or m1 shall be zero. * This union stores the constants used to calculate the analogue gain. The
*/ * CameraSensorHelper::gainType_ variable selects which union member is valid.
/**
* \var CameraSensorHelper::AnalogueGainConstants::c0
* \brief Constant used in the analogue gain coding/decoding
*/
/**
* \var CameraSensorHelper::AnalogueGainConstants::m1
* \brief Constant used in the analogue gain coding/decoding
* *
* \note Either m0 or m1 shall be zero. * \var CameraSensorHelper::AnalogueGainConstants::linear
* \brief Constants for the linear gain model
*/ */
/** /**
* \var CameraSensorHelper::AnalogueGainConstants::c1 * \var CameraSensorHelper::gainType_
* \brief Constant used in the analogue gain coding/decoding * \brief The analogue gain model type
*/ */
/** /**
* \var CameraSensorHelper::analogueGainConstants_ * \var CameraSensorHelper::gainConstants_
* \brief The analogue gain parameters used for calculation * \brief The analogue gain parameters used for calculation
* *
* The analogue gain is calculated through a formula, and its parameters are * The analogue gain is calculated through a formula, and its parameters are
@ -290,7 +297,8 @@ class CameraSensorHelperImx219 : public CameraSensorHelper
public: public:
CameraSensorHelperImx219() CameraSensorHelperImx219()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 0, 256, -1, 256 }; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 0, 256, -1, 256 };
} }
}; };
REGISTER_CAMERA_SENSOR_HELPER("imx219", CameraSensorHelperImx219) REGISTER_CAMERA_SENSOR_HELPER("imx219", CameraSensorHelperImx219)
@ -298,10 +306,11 @@ REGISTER_CAMERA_SENSOR_HELPER("imx219", CameraSensorHelperImx219)
class CameraSensorHelperImx258 : public CameraSensorHelper class CameraSensorHelperImx258 : public CameraSensorHelper
{ {
public: public:
CameraSensorHelperImx258() CameraSensorHelperImx258()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 0, 512, -1, 512 }; gainType_ = AnalogueGainLinear;
} gainConstants_.linear = { 0, 512, -1, 512 };
}
}; };
REGISTER_CAMERA_SENSOR_HELPER("imx258", CameraSensorHelperImx258) REGISTER_CAMERA_SENSOR_HELPER("imx258", CameraSensorHelperImx258)
@ -310,7 +319,8 @@ class CameraSensorHelperOv2740 : public CameraSensorHelper
public: public:
CameraSensorHelperOv2740() CameraSensorHelperOv2740()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 1, 0, 0, 128 }; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 128 };
} }
}; };
REGISTER_CAMERA_SENSOR_HELPER("ov2740", CameraSensorHelperOv2740) REGISTER_CAMERA_SENSOR_HELPER("ov2740", CameraSensorHelperOv2740)
@ -320,7 +330,8 @@ class CameraSensorHelperOv5670 : public CameraSensorHelper
public: public:
CameraSensorHelperOv5670() CameraSensorHelperOv5670()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 1, 0, 0, 128 }; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 128 };
} }
}; };
REGISTER_CAMERA_SENSOR_HELPER("ov5670", CameraSensorHelperOv5670) REGISTER_CAMERA_SENSOR_HELPER("ov5670", CameraSensorHelperOv5670)
@ -330,7 +341,8 @@ class CameraSensorHelperOv5693 : public CameraSensorHelper
public: public:
CameraSensorHelperOv5693() CameraSensorHelperOv5693()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 1, 0, 0, 16 }; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 16 };
} }
}; };
REGISTER_CAMERA_SENSOR_HELPER("ov5693", CameraSensorHelperOv5693) REGISTER_CAMERA_SENSOR_HELPER("ov5693", CameraSensorHelperOv5693)
@ -340,7 +352,8 @@ class CameraSensorHelperOv8865 : public CameraSensorHelper
public: public:
CameraSensorHelperOv8865() CameraSensorHelperOv8865()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 1, 0, 0, 128 }; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 128 };
} }
}; };
REGISTER_CAMERA_SENSOR_HELPER("ov8865", CameraSensorHelperOv8865) REGISTER_CAMERA_SENSOR_HELPER("ov8865", CameraSensorHelperOv8865)
@ -350,7 +363,8 @@ class CameraSensorHelperOv13858 : public CameraSensorHelper
public: public:
CameraSensorHelperOv13858() CameraSensorHelperOv13858()
{ {
analogueGainConstants_ = { AnalogueGainLinear, 1, 0, 0, 128 }; gainType_ = AnalogueGainLinear;
gainConstants_.linear = { 1, 0, 0, 128 };
} }
}; };
REGISTER_CAMERA_SENSOR_HELPER("ov13858", CameraSensorHelperOv13858) REGISTER_CAMERA_SENSOR_HELPER("ov13858", CameraSensorHelperOv13858)

10
src/ipa/libipa/camera_sensor_helper.h
View file

@ -34,15 +34,19 @@ protected:
AnalogueGainExponential, AnalogueGainExponential,
}; };
struct AnalogueGainConstants { struct AnalogueGainLinearConstants {
AnalogueGainType type;
int16_t m0; int16_t m0;
int16_t c0; int16_t c0;
int16_t m1; int16_t m1;
int16_t c1; int16_t c1;
}; };
AnalogueGainConstants analogueGainConstants_; union AnalogueGainConstants {
AnalogueGainLinearConstants linear;
};
AnalogueGainType gainType_;
AnalogueGainConstants gainConstants_;
private: private:
LIBCAMERA_DISABLE_COPY_AND_MOVE(CameraSensorHelper) LIBCAMERA_DISABLE_COPY_AND_MOVE(CameraSensorHelper)