libcamera: camera_sensor_properties: Add sensor control delays
Add properties covering the sensor control application delays to both the static CameraSensorProperties definitions. The values used are taken from Raspberry Pi's CamHelper class definitions. Where no more specific values are known the delay struct is defined as empty and defaults supplied through the getter function. Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> Signed-off-by: Daniel Scally <dan.scally@ideasonboard.com>
This commit is contained in:
@@ -41,6 +41,35 @@ LOG_DEFINE_CATEGORY(CameraSensorProperties)
|
||||
* \brief Map that associates the TestPattern control value with the indexes of
|
||||
* the corresponding sensor test pattern modes as returned by
|
||||
* V4L2_CID_TEST_PATTERN.
|
||||
*
|
||||
* \var CameraSensorProperties::sensorDelays
|
||||
* \brief Sensor control application delays
|
||||
*
|
||||
* This structure may be defined as empty if the actual sensor delays are not
|
||||
* available or have not been measured.
|
||||
*/
|
||||
|
||||
/**
|
||||
* \struct CameraSensorProperties::SensorDelays
|
||||
* \brief Sensor control application delay values
|
||||
*
|
||||
* This structure holds delay values, expressed in number of frames, between the
|
||||
* time a control value is applied to the sensor and the time that value is
|
||||
* reflected in the output. For example "2 frames delay" means that parameters
|
||||
* set during frame N will take effect for frame N+2 (and by extension a delay
|
||||
* of 0 would mean the parameter is applied immediately to the current frame).
|
||||
*
|
||||
* \var CameraSensorProperties::SensorDelays::exposureDelay
|
||||
* \brief Number of frames between application of exposure control and effect
|
||||
*
|
||||
* \var CameraSensorProperties::SensorDelays::gainDelay
|
||||
* \brief Number of frames between application of analogue gain control and effect
|
||||
*
|
||||
* \var CameraSensorProperties::SensorDelays::vblankDelay
|
||||
* \brief Number of frames between application of vblank control and effect
|
||||
*
|
||||
* \var CameraSensorProperties::SensorDelays::hblankDelay
|
||||
* \brief Number of frames between application of hblank control and effect
|
||||
*/
|
||||
|
||||
/**
|
||||
@@ -60,6 +89,12 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeColorBars, 2 },
|
||||
{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },
|
||||
},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "ar0521", {
|
||||
.unitCellSize = { 2200, 2200 },
|
||||
@@ -69,6 +104,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeColorBars, 2 },
|
||||
{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "hi846", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -87,6 +123,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* 9: "Resolution Pattern"
|
||||
*/
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx214", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -97,6 +134,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },
|
||||
{ controls::draft::TestPatternModePn9, 4 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx219", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -107,6 +145,12 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },
|
||||
{ controls::draft::TestPatternModePn9, 4 },
|
||||
},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 1,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "imx258", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -117,38 +161,67 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },
|
||||
{ controls::draft::TestPatternModePn9, 4 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx283", {
|
||||
.unitCellSize = { 2400, 2400 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "imx290", {
|
||||
.unitCellSize = { 2900, 2900 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "imx296", {
|
||||
.unitCellSize = { 3450, 3450 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "imx327", {
|
||||
.unitCellSize = { 2900, 2900 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx335", {
|
||||
.unitCellSize = { 2000, 2000 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx415", {
|
||||
.unitCellSize = { 1450, 1450 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx462", {
|
||||
.unitCellSize = { 2900, 2900 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "imx477", {
|
||||
.unitCellSize = { 1550, 1550 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 3,
|
||||
.hblankDelay = 3
|
||||
},
|
||||
} },
|
||||
{ "imx519", {
|
||||
.unitCellSize = { 1220, 1220 },
|
||||
@@ -161,6 +234,12 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* these two patterns do not comply with MIPI CCS v1.1 (Section 10.1).
|
||||
*/
|
||||
},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 3,
|
||||
.hblankDelay = 3
|
||||
},
|
||||
} },
|
||||
{ "imx708", {
|
||||
.unitCellSize = { 1400, 1400 },
|
||||
@@ -171,6 +250,12 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeColorBarsFadeToGray, 3 },
|
||||
{ controls::draft::TestPatternModePn9, 4 },
|
||||
},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 3,
|
||||
.hblankDelay = 3
|
||||
},
|
||||
} },
|
||||
{ "ov2685", {
|
||||
.unitCellSize = { 1750, 1750 },
|
||||
@@ -185,6 +270,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* 5: "Color Square"
|
||||
*/
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov2740", {
|
||||
.unitCellSize = { 1400, 1400 },
|
||||
@@ -192,6 +278,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeOff, 0 },
|
||||
{ controls::draft::TestPatternModeColorBars, 1},
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov4689", {
|
||||
.unitCellSize = { 2000, 2000 },
|
||||
@@ -205,6 +292,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* colorBarType2 and colorBarType3.
|
||||
*/
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov5640", {
|
||||
.unitCellSize = { 1400, 1400 },
|
||||
@@ -212,10 +300,17 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeOff, 0 },
|
||||
{ controls::draft::TestPatternModeColorBars, 1 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov5647", {
|
||||
.unitCellSize = { 1400, 1400 },
|
||||
.testPatternModes = {},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "ov5670", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -223,6 +318,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeOff, 0 },
|
||||
{ controls::draft::TestPatternModeColorBars, 1 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov5675", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -230,6 +326,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeOff, 0 },
|
||||
{ controls::draft::TestPatternModeColorBars, 1 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov5693", {
|
||||
.unitCellSize = { 1400, 1400 },
|
||||
@@ -242,6 +339,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* Rolling Bar".
|
||||
*/
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov64a40", {
|
||||
.unitCellSize = { 1008, 1008 },
|
||||
@@ -255,6 +353,12 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* 4: "Vertical Color Bar Type 4"
|
||||
*/
|
||||
},
|
||||
.sensorDelays = {
|
||||
.exposureDelay = 2,
|
||||
.gainDelay = 2,
|
||||
.vblankDelay = 2,
|
||||
.hblankDelay = 2
|
||||
},
|
||||
} },
|
||||
{ "ov8858", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -268,6 +372,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* 4: "Vertical Color Bar Type 4"
|
||||
*/
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov8865", {
|
||||
.unitCellSize = { 1400, 1400 },
|
||||
@@ -282,6 +387,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
* 5: "Color squares with rolling bar"
|
||||
*/
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
{ "ov13858", {
|
||||
.unitCellSize = { 1120, 1120 },
|
||||
@@ -289,6 +395,7 @@ const CameraSensorProperties *CameraSensorProperties::get(const std::string &sen
|
||||
{ controls::draft::TestPatternModeOff, 0 },
|
||||
{ controls::draft::TestPatternModeColorBars, 1 },
|
||||
},
|
||||
.sensorDelays = { },
|
||||
} },
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user